Bump chainlink-env and image version to reduce dockerhub rate limit i…

…ssues (#8875) * Make test images smaller * bump image and chainlink-env versions * go mod tidy integration-tests * Remove image changes * bump chianlink-env again to get more cached images
smartcontractkit · Mar 30, 2023 · 987fe4a · 987fe4a
1 parent bd8dcfd
commit 987fe4a
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/automation-benchmark-tests.yml b/.github/workflows/automation-benchmark-tests.yml
@@ -57,6 +57,7 @@ jobs:
     name: ${{ inputs.network }} Automation Benchmark Test
     runs-on: ubuntu-latest
     env:
+      INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
       SELECTED_NETWORKS: ${{ inputs.network }}
       SLACK_API_KEY: ${{ secrets.QA_SLACK_API_KEY }}
       SLACK_CHANNEL: C03KJ5S7KEK
@@ -107,7 +108,7 @@ jobs:
           file: ./integration-tests/test.Dockerfile
           build-args: |
             BASE_IMAGE=${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/test-base-image
-            IMAGE_VERSION=v0.3.17
+            IMAGE_VERSION=v0.3.24
             SUITES="benchmark"
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

diff --git a/.github/workflows/integration-chaos-tests.yml b/.github/workflows/integration-chaos-tests.yml
@@ -7,6 +7,7 @@ on:
       - "*"
 
 env:
+  INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   REF_NAME: ${{ github.head_ref || github.ref_name }}
   DEVELOP_REF: develop
   BUILD_SHA_REF: chaos.${{ github.sha }}
@@ -84,7 +85,7 @@ jobs:
           file: ./integration-tests/test.Dockerfile
           build-args: |
             BASE_IMAGE=${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/test-base-image
-            IMAGE_VERSION=v0.3.17
+            IMAGE_VERSION=v0.3.24
             SUITES="${{ env.TEST_SUITE }}"
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml
@@ -37,7 +37,7 @@ jobs:
           file: ./integration-tests/test.Dockerfile
           build-args: |
             BASE_IMAGE=${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/test-base-image
-            IMAGE_VERSION=v0.3.17
+            IMAGE_VERSION=v0.3.24
             SUITES="chaos migration performance reorg smoke soak benchmark"
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -12,9 +12,10 @@ concurrency:
 
 env:
   # for test image builds
+  INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
   SOLANA_TEST_ECR: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-solana-tests
   TEST_BASE_ECR: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/test-base-image
-  TEST_BASE_VERSION: v0.3.19
+  TEST_BASE_VERSION: v0.3.24
 
   # for run-test variables and environment
   ENV_JOB_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:ci.${{ github.sha }}

diff --git a/.github/workflows/on-demand-ocr-soak-test.yml b/.github/workflows/on-demand-ocr-soak-test.yml
@@ -59,6 +59,7 @@ jobs:
       id-token: write
       contents: read
     env:
+      INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
       CHAINLINK_COMMIT_SHA: ${{ inputs.chainlinkVersion }}
       CHAINLINK_ENV_USER: ${{ github.actor }}
       SELECTED_NETWORKS: ${{ inputs.network }}
@@ -123,7 +124,7 @@ jobs:
           file: ./integration-tests/test.Dockerfile
           build-args: |
             BASE_IMAGE=${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/test-base-image
-            IMAGE_VERSION=v0.3.17
+            IMAGE_VERSION=v0.3.24
             SUITES="soak"
           AWS_REGION: ${{ secrets.QA_AWS_REGION }}
           AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}

diff --git a/.github/workflows/performance-tests.yml b/.github/workflows/performance-tests.yml
@@ -7,6 +7,8 @@ on:
         required: true
         default: suite
         type: string
+env:
+  INTERNAL_DOCKER_REPO: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com
 jobs:
   build-chainlink:
     environment: integration

diff --git a/integration-tests/go.mod b/integration-tests/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/rs/zerolog v1.29.0
 	github.com/satori/go.uuid v1.2.1-0.20181028125025-b2ce2384e17b
 	github.com/slack-go/slack v0.12.1
-	github.com/smartcontractkit/chainlink-env v0.30.23-0.20230327111055-d0c8557d3123
+	github.com/smartcontractkit/chainlink-env v0.3.25
 	github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230328133051-9d3eb8328c82
 	github.com/smartcontractkit/chainlink-testing-framework v1.11.0
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000

diff --git a/integration-tests/go.sum b/integration-tests/go.sum
@@ -1880,8 +1880,8 @@ github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
 github.com/slack-go/slack v0.12.1 h1:X97b9g2hnITDtNsNe5GkGx6O2/Sz/uC20ejRZN6QxOw=
 github.com/slack-go/slack v0.12.1/go.mod h1:hlGi5oXA+Gt+yWTPP0plCdRKmjsDxecdHxYQdlMQKOw=
 github.com/smartcontractkit/chainlink-cosmos v0.1.4-0.20230328025552-4e21318caf26 h1:sOCnJgBPI9gDuiaC2W39VYaGZQoMOyNgAFCAX/v+GYY=
-github.com/smartcontractkit/chainlink-env v0.30.23-0.20230327111055-d0c8557d3123 h1:0LGfZqe8R9IfcqqTCf3Bti+dQ1IHKRqmbIV9fg0LIjM=
-github.com/smartcontractkit/chainlink-env v0.30.23-0.20230327111055-d0c8557d3123/go.mod h1:9c0Czq4a6wZKY20BcoAlK29DnejQIiLo/MwKYtSFnHk=
+github.com/smartcontractkit/chainlink-env v0.3.25 h1:666LLXNSo0gDZgk4F07jsvYopa/E+8SnUjRKUftII2Y=
+github.com/smartcontractkit/chainlink-env v0.3.25/go.mod h1:9c0Czq4a6wZKY20BcoAlK29DnejQIiLo/MwKYtSFnHk=
 github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230328133051-9d3eb8328c82 h1:VsNyxHnmCIpCtryMyWDv9SIseroCINOp1bme7wdXXns=
 github.com/smartcontractkit/chainlink-relay v0.1.7-0.20230328133051-9d3eb8328c82/go.mod h1:jhYQLbmWJvlkET6zlnx961itsCZEhmG8QP19It664eQ=
 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20230328132724-705a2932e300 h1:3zjEZ8Hh1EVcu8A+7KVhD3fcWWgFKLeobgessj8OAOs=

diff --git a/integration-tests/scripts/buildTestImage b/integration-tests/scripts/buildTestImage
@@ -34,7 +34,7 @@ if [ "${SUITES}" = "" ]; then
     SUITES=${DEFAULT_SUITES}
 fi
 
-aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin
+aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin ${AWS_BASE}
 docker build -t "${TAG}" -f "./integration-tests/test.Dockerfile" --build-arg BASE_IMAGE="${BASE_IMAGE}" --build-arg IMAGE_VERSION="${BASE_IMAGE_VERSION}" --build-arg SUITES="${SUITES}" .
 if "${4}" = "true"]; then
     docker push "${TAG}"