diff --git a/.github/workflows/enos-release-testing-oss.yml b/.github/workflows/enos-release-testing-oss.yml index c94818690..10c12d784 100644 --- a/.github/workflows/enos-release-testing-oss.yml +++ b/.github/workflows/enos-release-testing-oss.yml @@ -7,13 +7,12 @@ on: - enos-release-testing-oss::* jobs: - product-metadata: if: ${{ startsWith(github.event.client_payload.payload.branch, 'release/') }} runs-on: ubuntu-latest outputs: - vault-revision: ${{ steps.get-metadata.outputs.vault-revision }} - vault-version: ${{ steps.set-product-version.outputs.product-version }} + vault-revision: ${{ github.event.client_payload.payload.sha }} + vault-version: ${{ github.event.client_payload.payload.version }} vault-version-package: ${{ steps.get-metadata.outputs.vault-version-package }} steps: - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3 @@ -21,15 +20,11 @@ jobs: # Check out the repository at the same Git SHA that was used to create # the artifacts to get the correct metadata. ref: ${{ github.event.client_payload.payload.sha }} - - name: Set Product version - id: set-product-version - uses: hashicorp/actions-set-product-version@v1 - id: get-metadata + env: + VAULT_VERSION: ${{ github.event.client_payload.payload.version }} run: | - # shellcheck disable=SC2129 - echo "vault-revision=$(make ci-get-revision)" >> "$GITHUB_OUTPUT" - echo "vault-version-package=$(echo ${{ steps.set-product-version.outputs.product-version }} | awk '{ gsub("-","~",$1); print $1 }')" >> "$GITHUB_OUTPUT" - # Get the workflow summary similar to CRT workflows + echo "vault-version-package=$(make ci-get-version-package)" >> "$GITHUB_OUTPUT" - name: Release Artifact Info run: | # shellcheck disable=SC2129