in e2e_tsa_mtls.sh, build timestamp-server only if not found

Signed-off-by: Dmitry S <[email protected]>
sigstore · Jul 18, 2023 · 3fe9281 · 3fe9281
1 parent 0e15d3d
commit 3fe9281
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/test/e2e_tsa_mtls.sh b/test/e2e_tsa_mtls.sh
@@ -32,14 +32,18 @@ TIMESTAMP_SERVER_KEY=$CERT_BASE/tsa-mtls-server.key
 TIMESTAMP_SERVER_NAME="server.example.com"
 TIMESTAMP_SERVER_URL=https://localhost:3000/api/v1/timestamp
 
-rm -fr /tmp/timestamp-authority
-git clone https://github.com/sigstore/timestamp-authority /tmp/timestamp-authority
-pushd /tmp/timestamp-authority
-make
-popd
-/tmp/timestamp-authority/bin/timestamp-server serve --disable-ntp-monitoring --tls-host 0.0.0.0 --tls-port 3000 \
-	--scheme https --tls-ca $TIMESTAMP_CACERT --tls-key $TIMESTAMP_SERVER_KEY --tls-certificate $TIMESTAMP_SERVER_CERT &
-export PATH="/tmp/timestampserver:$PATH"
+command -v timestamp-server >& /dev/null
+if [[ $? != 0 ]]; then
+	rm -fr /tmp/timestamp-authority
+	git clone https://github.com/sigstore/timestamp-authority /tmp/timestamp-authority
+	pushd /tmp/timestamp-authority
+	make
+	export PATH="/tmp/timestamp-authority:$PATH"
+	popd
+fi
+timestamp-server serve --disable-ntp-monitoring --tls-host 0.0.0.0 --tls-port 3000 \
+		--scheme https --tls-ca $TIMESTAMP_CACERT --tls-key $TIMESTAMP_SERVER_KEY --tls-certificate $TIMESTAMP_SERVER_CERT &
+
 
 IMG=${IMAGE_URI_DIGEST:-}
 if [[ "$#" -ge 1 ]]; then

diff --git a/test/testdata/gen-tsa-mtls-certs.sh b/test/testdata/gen-tsa-mtls-certs.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # This script generates certificates for testing
 # mTLS connection from 'cosign' command to the TSA server.