From e76ad0a26a1ed711a5d3ed5ac03b4ba361f5c77d Mon Sep 17 00:00:00 2001 From: Julian Nguyen <109386615+juliannguyen4@users.noreply.github.com> Date: Tue, 28 Jul 2026 09:13:23 -0700 Subject: [PATCH] Use promotion workflow in shared repo and delete that workflow from this repo --- ...age-and-promote-release-bundle-to-test.yml | 10 ++-- ...mote-and-optionally-tag-release-bundle.yml | 53 ------------------- ...d-gh-artifacts-as-jfrog-release-bundle.yml | 12 ++--- 3 files changed, 11 insertions(+), 64 deletions(-) delete mode 100644 .github/workflows/promote-and-optionally-tag-release-bundle.yml diff --git a/.github/workflows/ff-stage-and-promote-release-bundle-to-test.yml b/.github/workflows/ff-stage-and-promote-release-bundle-to-test.yml index 1c0d40aabc..2088a48732 100644 --- a/.github/workflows/ff-stage-and-promote-release-bundle-to-test.yml +++ b/.github/workflows/ff-stage-and-promote-release-bundle-to-test.yml @@ -25,15 +25,15 @@ jobs: permissions: contents: write - promote-release-bundle-to-test: + promote-release-bundle: needs: [ ff-stage-to-dev-tag, ] - uses: ./.github/workflows/promote-and-optionally-tag-release-bundle.yml + uses: aerospike/shared-workflows/.github/workflows/reusable_promote-release-bundle.yaml@jnguyen/CLIENT-5161-add-promote-release-bundle-workflow-for-qe with: - jfrog-project: ${{ vars.JFROG_PROJECT_FOR_CLIENT_TEAM }} - release-bundle-name: ${{ vars.JFROG_RELEASE_BUNDLE_NAME }} - release-bundle-version: ${{ inputs.jf-bundle-version }} + jf-project: ${{ vars.JFROG_PROJECT_FOR_CLIENT_TEAM }} + jf-bundle-name: ${{ vars.JFROG_RELEASE_BUNDLE_NAME }} + version: ${{ inputs.jf-bundle-version }} new-environment: TEST permissions: id-token: write diff --git a/.github/workflows/promote-and-optionally-tag-release-bundle.yml b/.github/workflows/promote-and-optionally-tag-release-bundle.yml deleted file mode 100644 index a17fb7a59c..0000000000 --- a/.github/workflows/promote-and-optionally-tag-release-bundle.yml +++ /dev/null @@ -1,53 +0,0 @@ -permissions: - id-token: write - -on: - workflow_call: - inputs: - release-bundle-name: - type: string - required: true - release-bundle-version: - type: string - required: true - release-bundle-tag: - type: string - description: Optional tag to apply to release bundle when first creating it - required: false - new-environment: - type: string - required: true - jfrog-project: - type: string - required: true - -jobs: - promote-release-bundle: - runs-on: ubuntu-24.04 - env: - RELEASE_BUNDLE_NAME: ${{ inputs.release-bundle-name }} - RELEASE_BUNDLE_VERSION: ${{ inputs.release-bundle-version }} - JF_PROJECT: ${{ inputs.jfrog-project }} - steps: - - name: Setup JFrog CLI - uses: jfrog/setup-jfrog-cli@1641575d87647fb969c0545f0b6a76873e328b7c # v5.0.0 - env: - JF_URL: https://${{ vars.JF_EXTERNAL_URL }} - JF_PROJECT: ${{ inputs.jfrog-project }} - with: - version: '2.92.0' - oidc-provider-name: ${{ vars.OIDC_PROVIDER_NAME }} - oidc-audience: ${{ vars.OIDC_AUDIENCE }} - - # Using --project flag here to be defensive, since setting the default JF project didn't work for other release bundle commands - - if: ${{ inputs.release-bundle-tag != '' }} - run: jf release-bundle-annotate --project "$JF_PROJECT" --tag "$RELEASE_BUNDLE_TAG" "$RELEASE_BUNDLE_NAME" "$RELEASE_BUNDLE_VERSION" - env: - RELEASE_BUNDLE_TAG: ${{ inputs.release-bundle-tag }} - - - uses: aerospike/shared-workflows/.github/actions/promote-release-bundle@df68d17cd7b577287b56cbbca5621a5cea0bf803 - with: - bundle-name: ${{ env.RELEASE_BUNDLE_NAME }} - version: ${{ env.RELEASE_BUNDLE_VERSION }} - environment: ${{ inputs.new-environment }} - jf-project: ${{ env.JF_PROJECT }} diff --git a/.github/workflows/reupload-gh-artifacts-as-jfrog-release-bundle.yml b/.github/workflows/reupload-gh-artifacts-as-jfrog-release-bundle.yml index 08a0540ec5..40854bb4fc 100644 --- a/.github/workflows/reupload-gh-artifacts-as-jfrog-release-bundle.yml +++ b/.github/workflows/reupload-gh-artifacts-as-jfrog-release-bundle.yml @@ -63,22 +63,22 @@ jobs: jf-bundle-name: ${{ vars.JFROG_RELEASE_BUNDLE_NAME }} # JFrog release bundle version version: ${{ inputs.next_release_version }} + jf-bundle-tag: ${{ inputs.latest_tag }} gh-workflows-ref: 1004088a1b5122b9b71a39b40f619f6b50e78d16 # Should match the version in your 'uses:' line permissions: contents: read id-token: write actions: read - promote-release-bundle-to-dev: + promote-release-bundle: needs: [ create-release-bundle ] - uses: ./.github/workflows/promote-and-optionally-tag-release-bundle.yml + uses: aerospike/shared-workflows/.github/workflows/reusable_promote-release-bundle.yaml@jnguyen/CLIENT-5161-add-promote-release-bundle-workflow-for-qe with: - jfrog-project: ${{ vars.JFROG_PROJECT_FOR_CLIENT_TEAM }} - release-bundle-name: ${{ vars.JFROG_RELEASE_BUNDLE_NAME }} - release-bundle-version: ${{ inputs.next_release_version }} - release-bundle-tag: ${{ inputs.latest_tag }} + jf-project: ${{ vars.JFROG_PROJECT_FOR_CLIENT_TEAM }} + jf-bundle-name: ${{ vars.JFROG_RELEASE_BUNDLE_NAME }} + version: ${{ inputs.next_release_version }} new-environment: DEV permissions: id-token: write