From c7f9949af1961653b1088a949c13974b8b66ff63 Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Fri, 17 Oct 2025 15:23:41 +0100 Subject: [PATCH 1/3] Rebasing to develop --- .../buildspecs/integration-tests-buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml b/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml index 29dc70c3a..194dd46a2 100644 --- a/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml +++ b/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml @@ -10,7 +10,7 @@ phases: - export AWS_SESSION_TOKEN=$(echo $temp_role | jq -r .Credentials.SessionToken) - make docker-hub-signin # - make docker-pull NAME=tester VERSION=latest - # Using previous version digest to handle image arch issue in smoke test stage for no arm terraform image in v1.2.1 + # Using digest to handle image arch issue in smoke test stage for no arm terraform image in v1.2.1 - make docker-pull NAME=tester DIGEST=sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c - docker tag $(make _docker-get-reg)/tester@sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c $(make _docker-get-reg)/tester:latest - | From cbd502e185991dacb32af2c3ecfe2312a980726a Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Fri, 17 Oct 2025 16:07:04 +0100 Subject: [PATCH 2/3] Fixing broken new tester image issue --- .../buildspecs/integration-tests-buildspec.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml b/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml index 194dd46a2..29dc70c3a 100644 --- a/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml +++ b/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml @@ -10,7 +10,7 @@ phases: - export AWS_SESSION_TOKEN=$(echo $temp_role | jq -r .Credentials.SessionToken) - make docker-hub-signin # - make docker-pull NAME=tester VERSION=latest - # Using digest to handle image arch issue in smoke test stage for no arm terraform image in v1.2.1 + # Using previous version digest to handle image arch issue in smoke test stage for no arm terraform image in v1.2.1 - make docker-pull NAME=tester DIGEST=sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c - docker tag $(make _docker-get-reg)/tester@sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c $(make _docker-get-reg)/tester:latest - | From 99eaa13fa82d4465205240ce445f6a6a5dc56bc5 Mon Sep 17 00:00:00 2001 From: Ajay Mudgal Date: Mon, 20 Oct 2025 10:31:19 +0100 Subject: [PATCH 3/3] Fixing integration tests issue in new tester image --- .../buildspecs/integration-tests-buildspec.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml b/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml index 29dc70c3a..c654f6e59 100644 --- a/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml +++ b/infrastructure/stacks/development-and-deployment-tools/buildspecs/integration-tests-buildspec.yml @@ -9,13 +9,13 @@ phases: - export AWS_SECRET_ACCESS_KEY=$(echo $temp_role | jq -r .Credentials.SecretAccessKey) - export AWS_SESSION_TOKEN=$(echo $temp_role | jq -r .Credentials.SessionToken) - make docker-hub-signin - # - make docker-pull NAME=tester VERSION=latest - # Using previous version digest to handle image arch issue in smoke test stage for no arm terraform image in v1.2.1 - - make docker-pull NAME=tester DIGEST=sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c - - docker tag $(make _docker-get-reg)/tester@sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c $(make _docker-get-reg)/tester:latest - | if [[ -z "$BLUE_GREEN_ENVIRONMENT" ]]; then + make docker-pull NAME=tester DIGEST=sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c + docker tag $(make _docker-get-reg)/tester@sha256:8c90f5292a78a8ced10b7644b1269174798db2fc92b5d01a7e9dac966e13b88c $(make _docker-get-reg)/tester:latest export BLUE_GREEN_ENVIRONMENT=$(make terraform-output STACKS=blue-green-link ENVIRONMENT=$SHARED_ENVIRONMENT OPTS='-raw connected_blue_green_environment' | tail -n1) + else + make docker-pull NAME=tester VERSION=latest fi build: commands: