diff --git a/cmd/integration_test/build/buildspecs/cloudstack-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/cloudstack-test-eks-a-cli.yml index eff625ab6e8e..d9e8e5de9816 100644 --- a/cmd/integration_test/build/buildspecs/cloudstack-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/cloudstack-test-eks-a-cli.yml @@ -98,7 +98,7 @@ phases: fi - STAGE="dev" - | - if [[ "$(CODEBUILD_INITIATOR)" =~ "aws-staging-eks-a-release" ]]; then + if [[ "$CODEBUILD_INITIATOR" =~ "aws-staging-eks-a-release" ]]; then STAGE="staging" fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml) diff --git a/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml index 0b192aaf8295..8ed5190b401e 100644 --- a/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/conformance-eks-a-cli.yml @@ -156,7 +156,7 @@ phases: fi - STAGE="dev" - | - if [[ "$(CODEBUILD_INITIATOR)" =~ "aws-staging-eks-a-release" ]]; then + if [[ "$CODEBUILD_INITIATOR" =~ "aws-staging-eks-a-release" ]]; then STAGE="staging" fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml) diff --git a/cmd/integration_test/build/buildspecs/docker-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/docker-test-eks-a-cli.yml index d5ff8cbd92cf..2f5a78ab0319 100644 --- a/cmd/integration_test/build/buildspecs/docker-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/docker-test-eks-a-cli.yml @@ -48,7 +48,7 @@ phases: fi - STAGE="dev" - | - if [[ "$(CODEBUILD_INITIATOR)" =~ "aws-staging-eks-a-release" ]]; then + if [[ "$CODEBUILD_INITIATOR" =~ "aws-staging-eks-a-release" ]]; then STAGE="staging" fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml) diff --git a/cmd/integration_test/build/buildspecs/nutanix-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/nutanix-test-eks-a-cli.yml index d8b54bea4998..40625e803f88 100644 --- a/cmd/integration_test/build/buildspecs/nutanix-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/nutanix-test-eks-a-cli.yml @@ -49,6 +49,8 @@ env: T_NUTANIX_TEMPLATE_NAME_REDHAT_9_1_32: "nutanix_ci:nutanix_template_rhel_9_1_32" LICENSE_TOKEN: "extended_support:license_token" LICENSE_TOKEN2: "extended_support:license_token2" + STAGING_LICENSE_TOKEN: "extended_support:staging_license_token" + STAGING_LICENSE_TOKEN2: "extended_support:staging_license_token2" phases: pre_build: commands: @@ -76,6 +78,11 @@ phases: if [ -f ./bin/local-bundle-release.yaml ]; then BUNDLES_OVERRIDE=true fi + - STAGE="dev" + - | + if [[ "$CODEBUILD_INITIATOR" =~ "aws-staging-eks-a-release" ]]; then + STAGE="staging" + fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml) - mv bin/nutanix/e2e.test bin/e2e.test - > @@ -92,6 +99,7 @@ phases: --cleanup-resources=true --test-report-folder=reports --branch-name=${BRANCH_NAME} + --stage=${STAGE} post_build: commands: - > diff --git a/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml index 42cbfc929b20..f7c795cacb90 100644 --- a/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/quick-test-eks-a-cli.yml @@ -233,7 +233,7 @@ phases: fi - STAGE="dev" - | - if [[ "$(CODEBUILD_INITIATOR)" =~ "aws-staging-eks-a-release" ]]; then + if [[ "$CODEBUILD_INITIATOR" =~ "aws-staging-eks-a-release" ]]; then STAGE="staging" fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml) diff --git a/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml index 22b36ad5dd6c..c3b19cc060a7 100644 --- a/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/tinkerbell-test-eks-a-cli.yml @@ -96,7 +96,7 @@ phases: fi - STAGE="dev" - | - if [[ "$(CODEBUILD_INITIATOR)" =~ "aws-staging-eks-a-release" ]]; then + if [[ "$CODEBUILD_INITIATOR" =~ "aws-staging-eks-a-release" ]]; then STAGE="staging" fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml) diff --git a/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml b/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml index 3e91dcbbc237..f43d3a410552 100644 --- a/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml +++ b/cmd/integration_test/build/buildspecs/vsphere-test-eks-a-cli.yml @@ -116,7 +116,7 @@ phases: fi - STAGE="dev" - | - if [[ "$(CODEBUILD_INITIATOR)" =~ "aws-staging-eks-a-release" ]]; then + if [[ "$CODEBUILD_INITIATOR" =~ "aws-staging-eks-a-release" ]]; then STAGE="staging" fi - SKIPPED_TESTS=$(yq e ".skipped_tests | @csv" ${CODEBUILD_SRC_DIR}/test/e2e/SKIPPED_TESTS.yaml)