From eb631bb22aee5b0ad858eb0a3f2107a67a4746b4 Mon Sep 17 00:00:00 2001 From: rahul Date: Tue, 17 Dec 2024 14:05:31 +0530 Subject: [PATCH 01/12] Added reusable workflow that releases images --- .github/workflows/reusable_image_release.yaml | 224 ++++++++++++++++++ 1 file changed, 224 insertions(+) create mode 100644 .github/workflows/reusable_image_release.yaml diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml new file mode 100644 index 0000000..e4eff51 --- /dev/null +++ b/.github/workflows/reusable_image_release.yaml @@ -0,0 +1,224 @@ +name: Reusable Pre Release and Release Pipeline for docker images + +on: + workflow_call: + inputs: + original_repo_name: + description: 'Full repository name (org/repo)' + type: string + required: true + docker_platforms: + description: 'Comma-separated list of Docker platforms' + type: string + default: 'linux/amd64,linux/arm64' + docker_image_name: + description: 'Docker image name to use' + type: string + required: true + integration_name: + type: string + required: false + default: '' + s_three_path: + type: string + required: false + default: '' + go_version_file: + type: string + required: false + default: 'go.mod' + release_command: + type: string + required: true + + run_integration_tests: + type: boolean + required: false + default: false + run_nix_unit_tests: + type: boolean + required: false + default: true + run_windows_unit_tests: + type: boolean + required: false + default: true + use_build_push_action: + type: boolean + required: true + use_custom_release: + type: boolean + required: true + + secrets: + docker_username: + description: 'DockerHub username' + required: true + docker_password: + description: 'DockerHub password' + required: true + github_token: + description: 'GitHub token for release editing' + required: true + +env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + DOCKER_PLATFORMS: ${{ inputs.docker_platforms }} + DOCKER_IMAGE_NAME: ${{ inputs.docker_image_name }} + TAG: ${{ github.event.release.tag_name }} + ORIGINAL_REPO_NAME: ${{ inputs.original_repo_name }} + REPO_FULL_NAME: ${{ github.event.repository.full_name }} + INTEGRATION: ${{ inputs.integration_name }} + S3_PATH: ${{ inputs.s_three_path }} + +jobs: + test-nix: + if: ${{ inputs.run_nix_unit_tests }} + uses: newrelic/coreint-automation/.github/workflows/_test_nix.yaml@v3 + + test-windows: + if: ${{ inputs.run_windows_unit_tests }} + runs-on: windows-latest + env: + GOPATH: ${{ github.workspace }} + defaults: + run: + working-directory: src/github.com/${{env.ORIGINAL_REPO_NAME}} + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + path: src/github.com/${{env.ORIGINAL_REPO_NAME}} + - name: Install Go + uses: actions/setup-go@v5 + with: + go-version-file: "src/github.com/${{ env.ORIGINAL_REPO_NAME }}/go.mod" + - name: Running unit tests + shell: pwsh + run: | + .\build\windows\unit_tests.ps1 + + integration-tests: + name: 🚧 Integration Tests + if: ${{ inputs.run_integration_tests }} + runs-on: ubuntu-latest + strategy: + matrix: + arch: [arm64, amd64] + steps: + - uses: actions/checkout@v4 + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.docker_username }} + password: ${{ secrets.docker_password }} + - name: Running integration tests + run: | + make integration-tests-${{ matrix.arch }} + + release-integration: + name: Publish container images to registry + runs-on: ubuntu-latest + steps: + - name: checkout + uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: setup Go + uses: actions/setup-go@v5 + with: + go-version-file: ${{ inputs.go_version_file }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ secrets.docker_username }} + password: ${{ secrets.docker_password }} + + - name: Add pre-release tag suffix + if: ${{ github.event.release.prerelease }} + run: | + echo "TAG_SUFFIX=-pre" >> $GITHUB_ENV + + - name: Generate version from tag + run: | + TAG_WITHOUT_V=$(echo "${{ env.TAG }}" | sed 's/^v//') + echo "VERSION=$TAG_WITHOUT_V" >> $GITHUB_ENV + + - name: Build and push versioned docker image + if: ${{ inputs.use_build_push_action }} + uses: docker/build-push-action@v6 + with: + platforms: ${{ env.DOCKER_PLATFORMS }} + context: . + push: true + tags: | + ${{ env.DOCKER_IMAGE_NAME }}:${{ env.VERSION }}${{ env.TAG_SUFFIX }} + + - name: Push latest tag + if: ${{ ! github.event.release.prerelease && inputs.use_build_push_action }} + uses: docker/build-push-action@v6 + with: + platforms: ${{ env.DOCKER_PLATFORMS }} + context: . + push: true + tags: ${{ env.DOCKER_IMAGE_NAME }}:latest + + - name: Run image release commands + if: ${{ inputs.use_custom_release }} + run: ${{ inputs.release_command }} + shell: bash + continue-on-error: false + env: + GENERATE_PACKAGES: true + PRERELEASE: ${{ github.event.release.prerelease }} + + - name: Update title for successful pre-release + if: ${{ github.event.release.prerelease }} + env: + GH_TOKEN: "${{ secrets.COREINT_BOT_TOKEN }}" + run: | + gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }}" + + + + notify-failure: + if: ${{ always() && failure() }} + needs: [release-integration] + runs-on: ubuntu-latest + steps: + - name: Notify failure via Slack + uses: archive/github-actions-slack@master + with: + slack-bot-user-oauth-access-token: ${{ secrets.COREINT_SLACK_TOKEN }} + slack-channel: ${{ secrets.COREINT_SLACK_CHANNEL }} + slack-text: "❌ `${{ env.ORIGINAL_REPO_NAME }}`: [image release failed](${{ github.server_url }}/${{ env.ORIGINAL_REPO_NAME }}/actions/runs/${{ github.run_id }})." + + update-title-on-failure: + if: ${{ always() && failure() }} + needs: [release-integration] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + + - if: ${{ github.event.release.prerelease }} + name: Reflect failure in pre-release title + env: + GH_TOKEN: "${{ secrets.github_token }}" + run: | + gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }} (pre-release-failure)" + + - if: ${{ ! github.event.release.prerelease }} + name: Reflect failure in release title + env: + GH_TOKEN: "${{ secrets.github_token }}" + run: | + gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }} (release-failure)" From 4270da0f1338b0c2ce5d8883d4488dc578693848 Mon Sep 17 00:00:00 2001 From: rahul Date: Tue, 17 Dec 2024 14:29:24 +0530 Subject: [PATCH 02/12] Fixed the github token secret --- .github/workflows/reusable_image_release.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index e4eff51..dc6ae03 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -57,12 +57,9 @@ on: docker_password: description: 'DockerHub password' required: true - github_token: - description: 'GitHub token for release editing' - required: true env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.COREINT_BOT_TOKEN }} DOCKER_PLATFORMS: ${{ inputs.docker_platforms }} DOCKER_IMAGE_NAME: ${{ inputs.docker_image_name }} TAG: ${{ github.event.release.tag_name }} @@ -212,13 +209,13 @@ jobs: - if: ${{ github.event.release.prerelease }} name: Reflect failure in pre-release title env: - GH_TOKEN: "${{ secrets.github_token }}" + GH_TOKEN: "${{ secrets.COREINT_BOT_TOKEN }}" run: | gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }} (pre-release-failure)" - if: ${{ ! github.event.release.prerelease }} name: Reflect failure in release title env: - GH_TOKEN: "${{ secrets.github_token }}" + GH_TOKEN: "${{ secrets.COREINT_BOT_TOKEN }}" run: | gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }} (release-failure)" From d08ac9413b40ce14c543b6f87396edb20d8d9d2d Mon Sep 17 00:00:00 2001 From: rahul Date: Tue, 17 Dec 2024 14:46:56 +0530 Subject: [PATCH 03/12] Added bot token --- .github/workflows/reusable_image_release.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index dc6ae03..8ec9fbb 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -57,9 +57,12 @@ on: docker_password: description: 'DockerHub password' required: true + bot_token: + description: 'Github Token' + required: true env: - GITHUB_TOKEN: ${{ secrets.COREINT_BOT_TOKEN }} + GITHUB_TOKEN: ${{ secrets.bot_token }} DOCKER_PLATFORMS: ${{ inputs.docker_platforms }} DOCKER_IMAGE_NAME: ${{ inputs.docker_image_name }} TAG: ${{ github.event.release.tag_name }} @@ -181,7 +184,7 @@ jobs: - name: Update title for successful pre-release if: ${{ github.event.release.prerelease }} env: - GH_TOKEN: "${{ secrets.COREINT_BOT_TOKEN }}" + GH_TOKEN: "${{ secrets.bot_token }}" run: | gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }}" @@ -209,13 +212,13 @@ jobs: - if: ${{ github.event.release.prerelease }} name: Reflect failure in pre-release title env: - GH_TOKEN: "${{ secrets.COREINT_BOT_TOKEN }}" + GH_TOKEN: "${{ secrets.bot_token }}" run: | gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }} (pre-release-failure)" - if: ${{ ! github.event.release.prerelease }} name: Reflect failure in release title env: - GH_TOKEN: "${{ secrets.COREINT_BOT_TOKEN }}" + GH_TOKEN: "${{ secrets.bot_token }}" run: | gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }} (release-failure)" From a842c0f36d2a926bf2f07f41ddeabf9d41b5df27 Mon Sep 17 00:00:00 2001 From: rahul Date: Tue, 17 Dec 2024 16:16:02 +0530 Subject: [PATCH 04/12] release depends on tests passing --- .github/workflows/reusable_image_release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index 8ec9fbb..d67a95a 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -122,6 +122,7 @@ jobs: release-integration: name: Publish container images to registry + needs: [test-nix, test-windows, integration-tests] runs-on: ubuntu-latest steps: - name: checkout From 2a7ecf751d7e1389b99136f97bbb9ef6a134a211 Mon Sep 17 00:00:00 2001 From: rahul Date: Tue, 17 Dec 2024 16:23:26 +0530 Subject: [PATCH 05/12] skipped tests dont affect workflow --- .github/workflows/reusable_image_release.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index d67a95a..21f5a3d 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -123,6 +123,11 @@ jobs: release-integration: name: Publish container images to registry needs: [test-nix, test-windows, integration-tests] + if: | + always() && + (needs.integration-tests.result == 'success' || needs.integration-tests.result == 'skipped') && + (needs.test-nix.result == 'success' || needs.test-nix.result == 'skipped') && + (needs.test-windows.result == 'success' || needs.test-windows.result == 'skipped') runs-on: ubuntu-latest steps: - name: checkout From c062490f2d795fe6ef7e663158f5431a0213fce1 Mon Sep 17 00:00:00 2001 From: rahul Date: Thu, 19 Dec 2024 15:54:01 +0530 Subject: [PATCH 06/12] Added AWS creds setup for ECS --- .github/workflows/reusable_image_release.yaml | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index 21f5a3d..5a528cd 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -23,6 +23,10 @@ on: type: string required: false default: '' + s_three_folder: + type: string + required: false + default: '' go_version_file: type: string required: false @@ -49,6 +53,10 @@ on: use_custom_release: type: boolean required: true + setup_aws_creds: + type: boolean + required: false + default: false secrets: docker_username: @@ -70,6 +78,7 @@ env: REPO_FULL_NAME: ${{ github.event.repository.full_name }} INTEGRATION: ${{ inputs.integration_name }} S3_PATH: ${{ inputs.s_three_path }} + S3_BASE_FOLDER: ${{ inputs.s_three_folder }} jobs: test-nix: @@ -158,6 +167,14 @@ jobs: run: | TAG_WITHOUT_V=$(echo "${{ env.TAG }}" | sed 's/^v//') echo "VERSION=$TAG_WITHOUT_V" >> $GITHUB_ENV + + - name: Setup AWS credentials + if: ${{ inputs.setup_aws_creds }} + uses: aws-actions/configure-aws-credentials@v4 + with: + aws-access-key-id: ${{ secrets.COREINT_AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.COREINT_AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-1 - name: Build and push versioned docker image if: ${{ inputs.use_build_push_action }} @@ -192,9 +209,7 @@ jobs: env: GH_TOKEN: "${{ secrets.bot_token }}" run: | - gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }}" - - + gh release edit ${{ github.event.release.tag_name }} --title "${{ github.event.release.tag_name }}" notify-failure: if: ${{ always() && failure() }} From 00feb98f20a8d7ccf0ca8b36325dd660d167019b Mon Sep 17 00:00:00 2001 From: rahul Date: Thu, 19 Dec 2024 16:01:28 +0530 Subject: [PATCH 07/12] added aws secrets --- .github/workflows/reusable_image_release.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index 5a528cd..6a0c725 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -68,6 +68,12 @@ on: bot_token: description: 'Github Token' required: true + aws_access_key_id: + description: 'AWS key ID' + required: false + aws_access_key_secret: + description: 'AWS key secret' + required: false env: GITHUB_TOKEN: ${{ secrets.bot_token }} @@ -172,8 +178,8 @@ jobs: if: ${{ inputs.setup_aws_creds }} uses: aws-actions/configure-aws-credentials@v4 with: - aws-access-key-id: ${{ secrets.COREINT_AWS_ACCESS_KEY_ID }} - aws-secret-access-key: ${{ secrets.COREINT_AWS_SECRET_ACCESS_KEY }} + aws-access-key-id: ${{ secrets.aws_access_key_id }} + aws-secret-access-key: ${{ secrets.aws_access_key_secret }} aws-region: us-east-1 - name: Build and push versioned docker image From 3b23fb5a59e8b514e4f05866cd1fb869cb037c7f Mon Sep 17 00:00:00 2001 From: rahul Date: Wed, 1 Jan 2025 13:16:35 +0530 Subject: [PATCH 08/12] custom build by default, tags for infra bundle work --- .github/workflows/reusable_image_release.yaml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index 6a0c725..b5a7248 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -31,7 +31,7 @@ on: type: string required: false default: 'go.mod' - release_command: + release_command_sh: type: string required: true @@ -50,9 +50,6 @@ on: use_build_push_action: type: boolean required: true - use_custom_release: - type: boolean - required: true setup_aws_creds: type: boolean required: false @@ -163,16 +160,20 @@ jobs: with: username: ${{ secrets.docker_username }} password: ${{ secrets.docker_password }} - - - name: Add pre-release tag suffix - if: ${{ github.event.release.prerelease }} - run: | - echo "TAG_SUFFIX=-pre" >> $GITHUB_ENV - + - name: Generate version from tag run: | TAG_WITHOUT_V=$(echo "${{ env.TAG }}" | sed 's/^v//') echo "VERSION=$TAG_WITHOUT_V" >> $GITHUB_ENV + echo "DOCKER_IMAGE_TAG=$TAG_WITHOUT_V" >> $GITHUB_ENV + + # On pre-releases, the suffix '-pre' is appended to the image tag + # Once all workflows start using the $DOCKER_IMAGE_TAG, $TAG_SUFFIX AND $VERSION can be removed + - name: Add pre-release tag suffix + if: ${{ github.event.release.prerelease }} + run: | + echo "TAG_SUFFIX=-pre" >> $GITHUB_ENV + echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}-pre" >> $GITHUB_ENV - name: Setup AWS credentials if: ${{ inputs.setup_aws_creds }} @@ -202,8 +203,7 @@ jobs: tags: ${{ env.DOCKER_IMAGE_NAME }}:latest - name: Run image release commands - if: ${{ inputs.use_custom_release }} - run: ${{ inputs.release_command }} + run: ${{ inputs.release_command_sh }} shell: bash continue-on-error: false env: From 4a518cad16ee554d7500a58de598c211482e00b5 Mon Sep 17 00:00:00 2001 From: rahul Date: Wed, 1 Jan 2025 13:42:08 +0530 Subject: [PATCH 09/12] Removed build push action --- .github/workflows/reusable_image_release.yaml | 30 +++---------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index b5a7248..e1f328e 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -11,8 +11,8 @@ on: description: 'Comma-separated list of Docker platforms' type: string default: 'linux/amd64,linux/arm64' + required: true docker_image_name: - description: 'Docker image name to use' type: string required: true integration_name: @@ -42,14 +42,11 @@ on: run_nix_unit_tests: type: boolean required: false - default: true + default: false run_windows_unit_tests: type: boolean required: false - default: true - use_build_push_action: - type: boolean - required: true + default: false setup_aws_creds: type: boolean required: false @@ -182,26 +179,7 @@ jobs: aws-access-key-id: ${{ secrets.aws_access_key_id }} aws-secret-access-key: ${{ secrets.aws_access_key_secret }} aws-region: us-east-1 - - - name: Build and push versioned docker image - if: ${{ inputs.use_build_push_action }} - uses: docker/build-push-action@v6 - with: - platforms: ${{ env.DOCKER_PLATFORMS }} - context: . - push: true - tags: | - ${{ env.DOCKER_IMAGE_NAME }}:${{ env.VERSION }}${{ env.TAG_SUFFIX }} - - - name: Push latest tag - if: ${{ ! github.event.release.prerelease && inputs.use_build_push_action }} - uses: docker/build-push-action@v6 - with: - platforms: ${{ env.DOCKER_PLATFORMS }} - context: . - push: true - tags: ${{ env.DOCKER_IMAGE_NAME }}:latest - + - name: Run image release commands run: ${{ inputs.release_command_sh }} shell: bash From d04610117abe715baf84cb307ef43c10fa9df3a7 Mon Sep 17 00:00:00 2001 From: rahul Date: Wed, 1 Jan 2025 15:32:27 +0530 Subject: [PATCH 10/12] removed s3 weird urls, added generate packages --- .github/workflows/reusable_image_release.yaml | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index e1f328e..b1f69d7 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -4,11 +4,9 @@ on: workflow_call: inputs: original_repo_name: - description: 'Full repository name (org/repo)' type: string required: true docker_platforms: - description: 'Comma-separated list of Docker platforms' type: string default: 'linux/amd64,linux/arm64' required: true @@ -19,14 +17,11 @@ on: type: string required: false default: '' - s_three_path: - type: string - required: false - default: '' - s_three_folder: + + bucket_url: type: string required: false - default: '' + default: 's3://nr-downloads-main/infrastructure_agent' go_version_file: type: string required: false @@ -51,6 +46,10 @@ on: type: boolean required: false default: false + generate_packages: + type: boolean + required: false + default: false secrets: docker_username: @@ -77,8 +76,10 @@ env: ORIGINAL_REPO_NAME: ${{ inputs.original_repo_name }} REPO_FULL_NAME: ${{ github.event.repository.full_name }} INTEGRATION: ${{ inputs.integration_name }} - S3_PATH: ${{ inputs.s_three_path }} - S3_BASE_FOLDER: ${{ inputs.s_three_folder }} + S3_PATH: ${{ inputs.bucket_url }} + S3_BASE_FOLDER: ${{ inputs.bucket_url }} + PRERELEASE: ${{ github.event.release.prerelease }} + GENERATE_PACKAGES: ${{ inputs.generate_packages }} jobs: test-nix: @@ -184,9 +185,6 @@ jobs: run: ${{ inputs.release_command_sh }} shell: bash continue-on-error: false - env: - GENERATE_PACKAGES: true - PRERELEASE: ${{ github.event.release.prerelease }} - name: Update title for successful pre-release if: ${{ github.event.release.prerelease }} From 20a57e8441522b7bad4bdd90e40ba9ac53657593 Mon Sep 17 00:00:00 2001 From: rahul Date: Thu, 9 Jan 2025 14:19:35 +0530 Subject: [PATCH 11/12] docker_platforms not required, better defaults --- .github/workflows/reusable_image_release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index b1f69d7..27bc812 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -8,8 +8,8 @@ on: required: true docker_platforms: type: string - default: 'linux/amd64,linux/arm64' - required: true + default: 'linux/amd64,linux/arm64,linux/arm' + required: false docker_image_name: type: string required: true From 154ef54b6fefa5423f5ef16b95c4fbba6ac391a5 Mon Sep 17 00:00:00 2001 From: rahul Date: Mon, 20 Jan 2025 13:42:42 +0530 Subject: [PATCH 12/12] env variables for prometheus are not set for all --- .github/workflows/reusable_image_release.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/reusable_image_release.yaml b/.github/workflows/reusable_image_release.yaml index 27bc812..283f079 100644 --- a/.github/workflows/reusable_image_release.yaml +++ b/.github/workflows/reusable_image_release.yaml @@ -46,10 +46,6 @@ on: type: boolean required: false default: false - generate_packages: - type: boolean - required: false - default: false secrets: docker_username: @@ -76,10 +72,8 @@ env: ORIGINAL_REPO_NAME: ${{ inputs.original_repo_name }} REPO_FULL_NAME: ${{ github.event.repository.full_name }} INTEGRATION: ${{ inputs.integration_name }} - S3_PATH: ${{ inputs.bucket_url }} S3_BASE_FOLDER: ${{ inputs.bucket_url }} PRERELEASE: ${{ github.event.release.prerelease }} - GENERATE_PACKAGES: ${{ inputs.generate_packages }} jobs: test-nix: @@ -159,6 +153,7 @@ jobs: username: ${{ secrets.docker_username }} password: ${{ secrets.docker_password }} + # Once all workflows start using the $DOCKER_IMAGE_TAG, $VERSION can be removed - name: Generate version from tag run: | TAG_WITHOUT_V=$(echo "${{ env.TAG }}" | sed 's/^v//') @@ -166,11 +161,9 @@ jobs: echo "DOCKER_IMAGE_TAG=$TAG_WITHOUT_V" >> $GITHUB_ENV # On pre-releases, the suffix '-pre' is appended to the image tag - # Once all workflows start using the $DOCKER_IMAGE_TAG, $TAG_SUFFIX AND $VERSION can be removed - name: Add pre-release tag suffix if: ${{ github.event.release.prerelease }} run: | - echo "TAG_SUFFIX=-pre" >> $GITHUB_ENV echo "DOCKER_IMAGE_TAG=${DOCKER_IMAGE_TAG}-pre" >> $GITHUB_ENV - name: Setup AWS credentials