diff --git a/.github/actions/build-chainlink-image/action.yml b/.github/actions/build-chainlink-image/action.yml index 0e457560bf0..074af238859 100644 --- a/.github/actions/build-chainlink-image/action.yml +++ b/.github/actions/build-chainlink-image/action.yml @@ -5,6 +5,9 @@ inputs: tag_suffix: description: The suffix to append to the image tag (usually blank or "-plugins") default: "" + tag_prefix: + description: The prefix to prepend to the image tag (usually blank) + default: "" dockerfile: description: The path to the Dockerfile to use (usually core/chainlink.Dockerfile or plugins/chainlink.Dockerfile) default: core/chainlink.Dockerfile @@ -32,7 +35,7 @@ runs: uses: smartcontractkit/chainlink-github-actions/docker/image-exists@75a9005952a9e905649cfb5a6971fd9429436acd # v2.3.25 with: repository: chainlink - tag: ${{ inputs.git_commit_sha }}${{ inputs.tag_suffix }} + tag: ${{ inputs.tag_prefix }}${{ inputs.git_commit_sha }}${{ inputs.tag_suffix }} AWS_REGION: ${{ inputs.AWS_REGION }} AWS_ROLE_TO_ASSUME: ${{ inputs.AWS_ROLE_TO_ASSUME }} - name: Build Image @@ -42,7 +45,7 @@ runs: cl_repo: smartcontractkit/chainlink cl_ref: ${{ inputs.git_commit_sha }} cl_dockerfile: ${{ inputs.dockerfile }} - push_tag: ${{ env.CHAINLINK_IMAGE }}:${{ inputs.git_commit_sha }}${{ inputs.tag_suffix }} + push_tag: ${{ env.CHAINLINK_IMAGE }}:${{ inputs.tag_prefix }}${{ inputs.git_commit_sha }}${{ inputs.tag_suffix }} QA_AWS_REGION: ${{ inputs.AWS_REGION }} QA_AWS_ROLE_TO_ASSUME: ${{ inputs.AWS_ROLE_TO_ASSUME }} GO_COVER_FLAG: true diff --git a/.github/workflows/integration-tests-publish.yml b/.github/workflows/integration-tests-publish.yml index df07cc1e231..f2c91d57677 100644 --- a/.github/workflows/integration-tests-publish.yml +++ b/.github/workflows/integration-tests-publish.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: env: - ECR_TAG: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests:develop + ECR_TAG_BASE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink-tests CHAINLINK_IMAGE: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.QA_AWS_REGION }}.amazonaws.com/chainlink jobs: @@ -28,7 +28,11 @@ jobs: id: tags if: github.event_name != 'workflow_dispatch' run: | - echo "other_tags=${ECR_TAG}" >> $GITHUB_OUTPUT + if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then + echo "other_tags=${ECR_TAG_BASE}:manual-${{ github.sha }}" >> $GITHUB_ENV + else + echo "other_tags=${ECR_TAG_BASE}:develop" >> $GITHUB_ENV + fi - name: Build Image uses: smartcontractkit/.github/actions/ctf-build-test-image@6781e048ecc1aadf7d605722c32e8068a5f829ce # ctf-build-test-image@0.2.0 with: @@ -58,10 +62,12 @@ jobs: - name: "" dockerfile: core/chainlink.Dockerfile tag-suffix: "" + tag-prefix: "manual-" # uncomment in the future if we end up needing to soak test the plugins image # - name: (plugins) # dockerfile: plugins/chainlink.Dockerfile # tag-suffix: -plugins + # tag-prefix: "manual-" name: Build Chainlink Image ${{ matrix.image.name }} runs-on: ubuntu22.04-8cores-32GB steps: @@ -72,6 +78,7 @@ jobs: - name: Build Chainlink Image uses: ./.github/actions/build-chainlink-image with: + tag_prefix: ${{ matrix.image.tag-prefix }} tag_suffix: ${{ matrix.image.tag-suffix }} dockerfile: ${{ matrix.image.dockerfile }} git_commit_sha: ${{ github.sha }}