From dacf09fbba3fa20e1fc596640b74f8b15d3d2b58 Mon Sep 17 00:00:00 2001 From: chainchad <96362174+chainchad@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:02:37 -0400 Subject: [PATCH] Update docker auth secret for CICD (#1137) ## Motivation New secret name reference. ## Solution Update. --- .github/workflows/build-publish-develop.yml | 4 ++-- .github/workflows/build-publish-pr.yml | 4 ++-- .github/workflows/build-publish.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- .github/workflows/live-vrf-tests.yml | 12 +++++------- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/workflows/build-publish-develop.yml b/.github/workflows/build-publish-develop.yml index 53507a29e8..6e8e5ba3f5 100644 --- a/.github/workflows/build-publish-develop.yml +++ b/.github/workflows/build-publish-develop.yml @@ -52,8 +52,8 @@ jobs: ecr-image-name: ccip-develop ecr-tag-suffix: ${{ matrix.image.tag-suffix }} dockerfile: ${{ matrix.image.dockerfile }} - dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }} - dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }} + dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }} + dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }} git-commit-sha: ${{ steps.git-ref.outputs.checked-out || github.sha }} - name: Collect Metrics diff --git a/.github/workflows/build-publish-pr.yml b/.github/workflows/build-publish-pr.yml index 7553b74fba..1a426cdeac 100644 --- a/.github/workflows/build-publish-pr.yml +++ b/.github/workflows/build-publish-pr.yml @@ -50,8 +50,8 @@ jobs: sign-images: false ecr-hostname: ${{ secrets.AWS_SDLC_ECR_HOSTNAME }} ecr-image-name: ${{ env.ECR_IMAGE_NAME }} - dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }} - dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }} + dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }} + dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }} - name: Collect Metrics if: always() diff --git a/.github/workflows/build-publish.yml b/.github/workflows/build-publish.yml index ef0f641db1..865bdaf730 100644 --- a/.github/workflows/build-publish.yml +++ b/.github/workflows/build-publish.yml @@ -46,8 +46,8 @@ jobs: cosign-private-key: ${{ secrets.COSIGN_PRIVATE_KEY }} cosign-public-key: ${{ secrets.COSIGN_PUBLIC_KEY }} cosign-password: ${{ secrets.COSIGN_PASSWORD }} - dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }} - dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }} + dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }} + dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }} verify-signature: true - name: Collect Metrics if: always() diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6e3272204e..b82b5a8203 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,8 +34,8 @@ jobs: if: ${{ steps.change.outputs.changelog-only == 'false' }} uses: ./.github/actions/build-sign-publish-chainlink with: - dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }} - dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }} + dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }} + dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }} publish: false sign-images: false diff --git a/.github/workflows/live-vrf-tests.yml b/.github/workflows/live-vrf-tests.yml index 89c62c104f..80eb14a589 100644 --- a/.github/workflows/live-vrf-tests.yml +++ b/.github/workflows/live-vrf-tests.yml @@ -30,8 +30,7 @@ env: TEST_LOG_LEVEL: debug jobs: - - # Build Test Dependencies + # Build Test Dependencies build-chainlink: environment: integration @@ -107,7 +106,6 @@ jobs: cache_restore_only: "true" binary_name: tests - # End Build Test Dependencies live-smoke-tests: @@ -120,7 +118,7 @@ jobs: needs: [build-chainlink, build-tests] strategy: fail-fast: false - matrix: + matrix: network: ${{fromJson(needs.build-tests.outputs.matrix)}} name: Smoke Tests on ${{ matrix.network }} runs-on: ubuntu-latest @@ -177,8 +175,8 @@ jobs: cl_repo: ${{ env.CHAINLINK_IMAGE }} cl_image_tag: ${{ github.sha }} aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }} - dockerhub_username: ${{ secrets.DOCKERHUB_READONLY_USERNAME }} - dockerhub_password: ${{ secrets.DOCKERHUB_READONLY_PASSWORD }} + dockerhub_username: ${{ secrets.DOCKER_READONLY_USERNAME }} + dockerhub_password: ${{ secrets.DOCKER_READONLY_PASSWORD }} artifacts_location: ./logs token: ${{ secrets.GITHUB_TOKEN }} cache_key_id: core-e2e-${{ env.MOD_CACHE_VERSION }} @@ -190,4 +188,4 @@ jobs: if: always() uses: smartcontractkit/chainlink-github-actions/chainlink-testing-framework/show-test-summary@fc3e0df622521019f50d772726d6bf8dc919dd38 # v2.3.19 with: - test_directory: "./" \ No newline at end of file + test_directory: "./"