diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml index eaf190a2c8..ee0e7a8ee5 100644 --- a/.github/workflows/ci-test.yml +++ b/.github/workflows/ci-test.yml @@ -89,13 +89,9 @@ jobs: # In case this is second attempt try restoring failed tests - name: Restore the previous failed combine result if: steps.run_result.outputs.run_result == 'failedtest' - uses: martijnhols/actions-cache/restore@v3 + uses: actions/download-artifact@v3 with: - path: | - ~/combined_failed_spec_ci - key: ${{ github.run_id }}-"ci-test-result" - restore-keys: | - ${{ github.run_id }}-${{ github.job }} + name: combined_failed_spec_ci # failed_spec_env will contain list of all failed specs # We are using environment variable instead of regular to support multiline diff --git a/.github/workflows/integration-tests-command.yml b/.github/workflows/integration-tests-command.yml index d8fcafc839..c258c3f048 100644 --- a/.github/workflows/integration-tests-command.yml +++ b/.github/workflows/integration-tests-command.yml @@ -108,24 +108,21 @@ jobs: name: failed-spec-ci path: ~/failed_spec_ci + # delete-artifact + - name: delete existing combined_failed_spec_ci artifact + uses: geekyeggo/delete-artifact@v2 + with: + name: combined_failed_spec_ci + failOnError: false + # In case for any ci job failure, create combined failed spec - name: "combine all specs for CI" if: needs.ci-test.result != 'success' - run: cat ~/failed_spec_ci/failed_spec_ci* >> ~/combined_failed_spec_ci - - # Force save the CI failed spec list into a cache - - name: Store the combined run result for CI - if: needs.ci-test.result != 'success' - uses: martijnhols/actions-cache/save@v3 - with: - path: | - ~/combined_failed_spec_ci - key: ${{ github.run_id }}-"ci-test-result" - restore-keys: | - ${{ github.run_id }}-${{ github.job }} + run: | + rm -f ~/combined_failed_spec_ci + cat ~/failed_spec_ci/failed_spec_ci* >> ~/combined_failed_spec_ci # Upload combined failed CI spec list to a file - # This is done for debugging. - name: upload combined failed spec if: needs.ci-test.result != 'success' uses: actions/upload-artifact@v3 @@ -134,7 +131,7 @@ jobs: path: ~/combined_failed_spec_ci # delete-artifact - - name: delete failed-spec-ci artifact + - name: delete existing failed-spec-ci artifact uses: geekyeggo/delete-artifact@v2 with: name: failed-spec-ci diff --git a/.github/workflows/test-build-docker-image.yml b/.github/workflows/test-build-docker-image.yml index f1a95adc58..f46009c372 100644 --- a/.github/workflows/test-build-docker-image.yml +++ b/.github/workflows/test-build-docker-image.yml @@ -89,28 +89,19 @@ jobs: name: failed-spec-ci path: ~/failed_spec_ci + # delete-artifact + - name: delete existing combined_failed_spec_ci artifact + uses: geekyeggo/delete-artifact@v2 + with: + name: combined_failed_spec_ci + failOnError: false + # In case for any ci job failure, create combined failed spec - name: "combine all specs for CI" if: needs.ci-test.result != 'success' - run: cat ~/failed_spec_ci/failed_spec_ci* >> ~/combined_failed_spec_ci - - # Force save the CI failed spec list into a cache - - name: Store the combined run result for CI - if: needs.ci-test.result != 'success' - uses: martijnhols/actions-cache/save@v3 - with: - path: | - ~/combined_failed_spec_ci - key: ${{ github.run_id }}-"ci-test-result" - restore-keys: | - ${{ github.run_id }}-${{ github.job }} - - # delete-artifact - - name: delete failed-spec-ci artifact - uses: geekyeggo/delete-artifact@v2 - with: - name: failed-spec-ci - failOnError: false + run: | + rm -f ~/combined_failed_spec_ci + cat ~/failed_spec_ci/failed_spec_ci* >> ~/combined_failed_spec_ci # Upload combined failed CI spec list to a file # This is done for debugging. @@ -121,6 +112,13 @@ jobs: name: combined_failed_spec_ci path: ~/combined_failed_spec_ci + # delete-artifact + - name: delete existing failed-spec-ci artifact + uses: geekyeggo/delete-artifact@v2 + with: + name: failed-spec-ci + failOnError: false + - name: Return status for ui-matrix run: | if [[ "${{ needs.ci-test.result }}" == "success" ]]; then