backport of commit fa5f0e6 (#20003)

Co-authored-by: Jaymala <jaymala@hashicorp.com>
hashicorp · Apr 5, 2023 · da09f60 · da09f60
1 parent 4b0296b
commit da09f60
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 19 deletions.
diff --git a/.github/workflows/enos-release-testing-oss.yml b/.github/workflows/enos-release-testing-oss.yml
@@ -31,6 +31,15 @@ jobs:
           echo "matrix-test-group=$(make ci-get-matrix-group-id)" >> "$GITHUB_OUTPUT"
           echo "vault-revision=$(make ci-get-revision)" >> "$GITHUB_OUTPUT"
           echo "vault-version=$(make ci-get-version)" >> "$GITHUB_OUTPUT"
+        # Get the workflow summary similar to CRT workflows
+      - name: Release Artifact Info
+        run: |
+          # shellcheck disable=SC2129
+          echo "__Product:__ ${{ github.event.client_payload.payload.product }}" >> "$GITHUB_STEP_SUMMARY"
+          echo "__Version:__ ${{ github.event.client_payload.payload.version }}" >> "$GITHUB_STEP_SUMMARY"
+          echo "__Commit:__ ${{ github.event.client_payload.payload.sha }}" >> "$GITHUB_STEP_SUMMARY"
+          echo "" >> "$GITHUB_STEP_SUMMARY"
+          echo "[Build Workflow](https://github.com/${{github.event.client_payload.payload.org}}/${{github.event.client_payload.payload.repo}}/actions/runs/${{github.event.client_payload.payload.buildworkflowid}})" >> "$GITHUB_STEP_SUMMARY"
 
   test:
     name: Test ${{ matrix.build-artifact-name }}
@@ -59,18 +68,3 @@ jobs:
     steps:
       - name: Persist metadata
         uses: hashicorp/actions-persist-metadata@v1
-
-  # Get the workflow summary similar to CRT workflows
-  release-artifact-info:
-    runs-on: linux
-    if: ${{ startsWith(github.event.action, 'enos-release-testing-oss') }}
-    continue-on-error: true
-    steps:
-      - name: Release Artifact Info
-        run: |
-          # shellcheck disable=SC2129
-          echo "__Product:__ ${{ github.event.client_payload.payload.product }}" >> "$GITHUB_STEP_SUMMARY"
-          echo "__Version:__ ${{ github.event.client_payload.payload.version }}" >> "$GITHUB_STEP_SUMMARY"
-          echo "__Commit:__ ${{ github.event.client_payload.payload.sha }}" >> "$GITHUB_STEP_SUMMARY"
-          echo "" >> "$GITHUB_STEP_SUMMARY"
-          echo "[Build Workflow](https://github.com/${{github.event.client_payload.payload.org}}/${{github.event.client_payload.payload.repo}}/actions/runs/${{github.event.client_payload.payload.buildworkflowid}})" >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/test-run-enos-scenario-matrix.yml b/.github/workflows/test-run-enos-scenario-matrix.yml
@@ -126,10 +126,10 @@ jobs:
       - name: Prepare scenario dependencies
         id: prepare_scenario
         run: |
-          mkdir -p ./enos/support/terraform-plugin-cache
-          echo "${{ secrets.SSH_KEY_PRIVATE_CI }}" > ./enos/support/private_key.pem
-          chmod 600 ./enos/support/private_key.pem
-          echo "debug_data_artifact_name=enos-debug-data_$(echo ${{ matrix.scenario }} | sed -e 's/ /_/g' | sed -e 's/:/=/g')" >> "$GITHUB_OUTPUT"
+          mkdir -p "./enos/support/terraform-plugin-cache"
+          echo "${{ secrets.SSH_KEY_PRIVATE_CI }}" > "./enos/support/private_key.pem"
+          chmod 600 "./enos/support/private_key.pem"
+          echo "debug_data_artifact_name=enos-debug-data_$(echo "${{ matrix.scenario }}" | sed -e 's/ /_/g' | sed -e 's/:/=/g')" >> $GITHUB_OUTPUT
       - if: contains(inputs.matrix-file-name, 'github')
         uses: actions/download-artifact@v3
         with: