From 82d7c15c553b391d0112af17b3ac53bfe0806aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 27 Oct 2025 15:37:53 +0100 Subject: [PATCH 1/2] [jj-spr] initial version Created using jj-spr 1.3.6-beta.1 --- .github/workflows/ami-release-nix-single.yml | 12 ++++++++++++ .github/workflows/ami-release-nix.yml | 12 ++++++++++++ .github/workflows/testinfra-ami-build.yml | 14 ++++++++++++++ 3 files changed, 38 insertions(+) diff --git a/.github/workflows/ami-release-nix-single.yml b/.github/workflows/ami-release-nix-single.yml index bb6641ff0..f31fc47b5 100644 --- a/.github/workflows/ami-release-nix-single.yml +++ b/.github/workflows/ami-release-nix-single.yml @@ -64,6 +64,12 @@ jobs: - name: Build AMI stage 1 env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} + AWS_STS_REGIONAL_ENDPOINTS: regional + AWS_MAX_ATTEMPTS: 15 + AWS_RETRY_MODE: standard + AWS_POLL_DELAY_SECONDS: 15 + AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 + AWS_METADATA_SERVICE_TIMEOUT: 5 run: | GIT_SHA=${{ steps.get_sha.outputs.sha }} nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl @@ -72,6 +78,12 @@ jobs: - name: Build AMI stage 2 env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} + AWS_STS_REGIONAL_ENDPOINTS: regional + AWS_MAX_ATTEMPTS: 15 + AWS_RETRY_MODE: standard + AWS_POLL_DELAY_SECONDS: 15 + AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 + AWS_METADATA_SERVICE_TIMEOUT: 5 run: | GIT_SHA=${{ steps.get_sha.outputs.sha }} nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml index af003c0e2..98f473d14 100644 --- a/.github/workflows/ami-release-nix.yml +++ b/.github/workflows/ami-release-nix.yml @@ -92,6 +92,12 @@ jobs: - name: Build AMI stage 1 env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} + AWS_STS_REGIONAL_ENDPOINTS: regional + AWS_MAX_ATTEMPTS: 15 + AWS_RETRY_MODE: standard + AWS_POLL_DELAY_SECONDS: 15 + AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 + AWS_METADATA_SERVICE_TIMEOUT: 5 run: | GIT_SHA=${{github.sha}} nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl @@ -101,6 +107,12 @@ jobs: - name: Build AMI stage 2 env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} + AWS_STS_REGIONAL_ENDPOINTS: regional + AWS_MAX_ATTEMPTS: 15 + AWS_RETRY_MODE: standard + AWS_POLL_DELAY_SECONDS: 15 + AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 + AWS_METADATA_SERVICE_TIMEOUT: 5 run: | GIT_SHA=${{github.sha}} nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl diff --git a/.github/workflows/testinfra-ami-build.yml b/.github/workflows/testinfra-ami-build.yml index c337e6e47..beba3e31c 100644 --- a/.github/workflows/testinfra-ami-build.yml +++ b/.github/workflows/testinfra-ami-build.yml @@ -109,12 +109,26 @@ jobs: echo "" >> common-nix.vars.pkr.hcl - name: Build AMI stage 1 + env: + AWS_STS_REGIONAL_ENDPOINTS: regional + AWS_MAX_ATTEMPTS: 15 + AWS_RETRY_MODE: standard + AWS_POLL_DELAY_SECONDS: 15 + AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 + AWS_METADATA_SERVICE_TIMEOUT: 5 run: | GIT_SHA=${{github.sha}} nix run github:supabase/postgres/${GIT_SHA}#packer -- init amazon-arm64-nix.pkr.hcl nix run github:supabase/postgres/${GIT_SHA}#packer -- build -var "git-head-version=${GIT_SHA}" -var "packer-execution-id=${EXECUTION_ID}" -var-file="development-arm.vars.pkr.hcl" -var-file="common-nix.vars.pkr.hcl" -var "ansible_arguments=" -var "postgres-version=${{ steps.random.outputs.random_string }}" -var "region=ap-southeast-1" -var 'ami_regions=["ap-southeast-1"]' -var "force-deregister=true" -var "ansible_arguments=-e postgresql_major=${POSTGRES_MAJOR_VERSION}" amazon-arm64-nix.pkr.hcl - name: Build AMI stage 2 + env: + AWS_STS_REGIONAL_ENDPOINTS: regional + AWS_MAX_ATTEMPTS: 15 + AWS_RETRY_MODE: standard + AWS_POLL_DELAY_SECONDS: 15 + AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 + AWS_METADATA_SERVICE_TIMEOUT: 5 run: | GIT_SHA=${{github.sha}} nix run github:supabase/postgres/${GIT_SHA}#packer -- init stage2-nix-psql.pkr.hcl From a3f054e140b81058d3e362e3400a199748f38e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Mon, 27 Oct 2025 15:37:53 +0100 Subject: [PATCH 2/2] Increase retry from 15 to 50 Created using jj-spr 1.3.6-beta.1 --- .github/workflows/ami-release-nix-single.yml | 4 ++-- .github/workflows/ami-release-nix.yml | 4 ++-- .github/workflows/testinfra-ami-build.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ami-release-nix-single.yml b/.github/workflows/ami-release-nix-single.yml index f31fc47b5..3d797d127 100644 --- a/.github/workflows/ami-release-nix-single.yml +++ b/.github/workflows/ami-release-nix-single.yml @@ -65,7 +65,7 @@ jobs: env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} AWS_STS_REGIONAL_ENDPOINTS: regional - AWS_MAX_ATTEMPTS: 15 + AWS_MAX_ATTEMPTS: 50 AWS_RETRY_MODE: standard AWS_POLL_DELAY_SECONDS: 15 AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 @@ -79,7 +79,7 @@ jobs: env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} AWS_STS_REGIONAL_ENDPOINTS: regional - AWS_MAX_ATTEMPTS: 15 + AWS_MAX_ATTEMPTS: 50 AWS_RETRY_MODE: standard AWS_POLL_DELAY_SECONDS: 15 AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 diff --git a/.github/workflows/ami-release-nix.yml b/.github/workflows/ami-release-nix.yml index 98f473d14..195a334bf 100644 --- a/.github/workflows/ami-release-nix.yml +++ b/.github/workflows/ami-release-nix.yml @@ -93,7 +93,7 @@ jobs: env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} AWS_STS_REGIONAL_ENDPOINTS: regional - AWS_MAX_ATTEMPTS: 15 + AWS_MAX_ATTEMPTS: 50 AWS_RETRY_MODE: standard AWS_POLL_DELAY_SECONDS: 15 AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 @@ -108,7 +108,7 @@ jobs: env: POSTGRES_MAJOR_VERSION: ${{ env.POSTGRES_MAJOR_VERSION }} AWS_STS_REGIONAL_ENDPOINTS: regional - AWS_MAX_ATTEMPTS: 15 + AWS_MAX_ATTEMPTS: 50 AWS_RETRY_MODE: standard AWS_POLL_DELAY_SECONDS: 15 AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 diff --git a/.github/workflows/testinfra-ami-build.yml b/.github/workflows/testinfra-ami-build.yml index beba3e31c..19869df6e 100644 --- a/.github/workflows/testinfra-ami-build.yml +++ b/.github/workflows/testinfra-ami-build.yml @@ -111,7 +111,7 @@ jobs: - name: Build AMI stage 1 env: AWS_STS_REGIONAL_ENDPOINTS: regional - AWS_MAX_ATTEMPTS: 15 + AWS_MAX_ATTEMPTS: 50 AWS_RETRY_MODE: standard AWS_POLL_DELAY_SECONDS: 15 AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10 @@ -124,7 +124,7 @@ jobs: - name: Build AMI stage 2 env: AWS_STS_REGIONAL_ENDPOINTS: regional - AWS_MAX_ATTEMPTS: 15 + AWS_MAX_ATTEMPTS: 50 AWS_RETRY_MODE: standard AWS_POLL_DELAY_SECONDS: 15 AWS_METADATA_SERVICE_NUM_ATTEMPTS: 10