From c6f66cf3e8c61357f786ada53acc292b87bd4af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Wei=C3=9Fe?= Date: Thu, 2 May 2024 12:00:26 +0200 Subject: [PATCH] Fix verify e2e test not creating json file for gcp-sev-snp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Daniel Weiße --- .github/actions/e2e_verify/action.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.github/actions/e2e_verify/action.yml b/.github/actions/e2e_verify/action.yml index c52d02f43..f330751f5 100644 --- a/.github/actions/e2e_verify/action.yml +++ b/.github/actions/e2e_verify/action.yml @@ -66,12 +66,16 @@ runs: forwarderPID=$! sleep 5 - if [[ ${{ inputs.attestationVariant }} == "azure-sev-snp" ]] || [[ ${{ inputs.attestationVariant }} == "aws-sev-snp" ]]; then - echo "Extracting TCB versions for API update" - constellation verify --cluster-id "${clusterID}" --node-endpoint localhost:9090 -o json > "snp-report-${node}.json" - else - constellation verify --cluster-id "${clusterID}" --node-endpoint localhost:9090 - fi + case "${{ inputs.attestationVariant }}" + in + "azure-sev-snp"|"aws-sev-snp"|"gcp-sev-snp") + echo "Extracting TCB versions for API update" + constellation verify --cluster-id "${clusterID}" --node-endpoint localhost:9090 -o json > "snp-report-${node}.json" + ;; + *) + constellation verify --cluster-id "${clusterID}" --node-endpoint localhost:9090 + ;; + esac kill $forwarderPID done @@ -90,11 +94,6 @@ runs: COSIGN_PASSWORD: ${{ inputs.cosignPassword }} COSIGN_PRIVATE_KEY: ${{ inputs.cosignPrivateKey }} run: | - if [[ ${{ inputs.attestationVariant }} == "aws-sev-snp" ]] && constellation version | grep -q "v2.13."; then - echo "Skipping TCB upload for AWS on CLI v2.13" - exit 0 - fi - reports=(snp-report-*.json) if [ -z ${#reports[@]} ]; then exit 1