diff --git a/.github/actions/e2e_verify/action.yml b/.github/actions/e2e_verify/action.yml index 481d7d0e1..f390660b9 100644 --- a/.github/actions/e2e_verify/action.yml +++ b/.github/actions/e2e_verify/action.yml @@ -66,8 +66,7 @@ runs: forwarderPID=$! sleep 5 - # TODO(v2.15): Remove workaround since we don't need to support v2.13 anymore - if [[ ${{ inputs.attestationVariant }} == "azure-sev-snp" ]] || { [[ ${{ inputs.attestationVariant }} == "aws-sev-snp" ]] && ! constellation version | grep -q "v2.13."; }; then + 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 diff --git a/.github/workflows/e2e-test-release.yml b/.github/workflows/e2e-test-release.yml index 8a787df03..edd555542 100644 --- a/.github/workflows/e2e-test-release.yml +++ b/.github/workflows/e2e-test-release.yml @@ -340,8 +340,8 @@ jobs: fail-fast: false max-parallel: 1 matrix: - fromVersion: ["v2.14.0"] - attestationVariant: ["gcp-sev-es", "azure-sev-snp", "aws-sev-snp"] # TODO(v2.15) Add azure-tdx to test matrix + fromVersion: ["v2.15.0"] + attestationVariant: ["gcp-sev-es", "azure-sev-snp", "azure-tdx", "aws-sev-snp"] name: Run upgrade tests secrets: inherit permissions: diff --git a/.github/workflows/e2e-test-weekly.yml b/.github/workflows/e2e-test-weekly.yml index d20fa928b..7ccb4237d 100644 --- a/.github/workflows/e2e-test-weekly.yml +++ b/.github/workflows/e2e-test-weekly.yml @@ -417,8 +417,8 @@ jobs: fail-fast: false max-parallel: 1 matrix: - fromVersion: ["v2.14.0"] - attestationVariant: ["gcp-sev-es", "azure-sev-snp", "aws-sev-snp"] # TODO(v2.15) Add azure-tdx to test matrix + fromVersion: ["v2.15.0"] + attestationVariant: ["gcp-sev-es", "azure-sev-snp", "azure-tdx", "aws-sev-snp"] name: Run upgrade tests secrets: inherit permissions: diff --git a/terraform-provider-constellation/internal/provider/attestation_data_source_test.go b/terraform-provider-constellation/internal/provider/attestation_data_source_test.go index 5f08cc91d..18bf902d9 100644 --- a/terraform-provider-constellation/internal/provider/attestation_data_source_test.go +++ b/terraform-provider-constellation/internal/provider/attestation_data_source_test.go @@ -54,7 +54,6 @@ func TestAccAttestationSource(t *testing.T) { }, }, "azure tdx success": { - // TODO(v2.15): Use regular image tag instead of pseudo version ProtoV6ProviderFactories: testAccProtoV6ProviderFactories, PreCheck: bazelPreCheck, Steps: []resource.TestStep{ @@ -64,9 +63,9 @@ func TestAccAttestationSource(t *testing.T) { csp = "azure" attestation_variant = "azure-tdx" image = { - version = "ref/main/stream/debug/v2.15.0-pre.0.20240124172919-4431ac3233bd" - reference = "ref/main/stream/debug/v2.15.0-pre.0.20240124172919-4431ac3233bd" - short_path = "ref/main/stream/debug/v2.15.0-pre.0.20240124172919-4431ac3233bd" + version = "v2.15.0 + reference = "v2.15.0 + short_path = "v2.15.0 } insecure = true } diff --git a/version.txt b/version.txt index 4db2f4d91..79fa94a5c 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v2.15.0-pre +v2.16.0-pre