diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml index f3a1d87b3..6848da22e 100644 --- a/.github/workflows/images_build_rhel.yml +++ b/.github/workflows/images_build_rhel.yml @@ -228,7 +228,7 @@ jobs: ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}_digest ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}_tag_id ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}_tag - key: ${{ env.BASE_BUILD_NAME }}-${{ matrix.arch }}-${{ github.run_id }} + key: ${{ env.BASE_BUILD_NAME }}-${{ matrix.arch }}-${{ github.run_id }}-{{ github.run_attempt }} - name: Push image to local storage env: @@ -297,7 +297,7 @@ jobs: ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}_digest ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}_tag_id ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}_tag - key: ${{ env.BASE_BUILD_NAME }}-${{ matrix.arch }}-${{ github.run_id }} + key: ${{ env.BASE_BUILD_NAME }}-${{ matrix.arch }}-${{ github.run_id }}-{{ github.run_attempt }} - name: Retrieve ${{ env.BASE_BUILD_NAME }}:${{ matrix.arch }} info id: base_build @@ -373,7 +373,7 @@ jobs: ${{ matrix.build }}_${{ matrix.arch }}_digest ${{ matrix.build }}_${{ matrix.arch }}_tag_id ${{ matrix.build }}_${{ matrix.arch }}_tag - key: ${{ matrix.build }}-${{ matrix.arch }}-${{ github.run_id }} + key: ${{ matrix.build }}-${{ matrix.arch }}-${{ github.run_id }}-{{ github.run_attempt }} - name: Push image to local storage env: @@ -473,7 +473,7 @@ jobs: ${{ steps.build_base_image.outputs.build_base }}_${{ matrix.arch }}_digest ${{ steps.build_base_image.outputs.build_base }}_${{ matrix.arch }}_tag_id ${{ steps.build_base_image.outputs.build_base }}_${{ matrix.arch }}_tag - key: ${{ steps.build_base_image.outputs.build_base }}-${{ matrix.arch }}-${{ github.run_id }} + key: ${{ steps.build_base_image.outputs.build_base }}-${{ matrix.arch }}-${{ github.run_id }}-{{ github.run_attempt }} - name: Retrieve ${{ steps.build_base_image.outputs.build_base }}:${{ matrix.arch }} info id: base_build @@ -623,7 +623,7 @@ jobs: uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ${{ matrix.build }}_${{ matrix.arch }}_digest - key: ${{ matrix.build }}-${{ matrix.arch }}-${{ github.run_id }} + key: ${{ matrix.build }}-${{ matrix.arch }}-${{ github.run_id }}-{{ github.run_attempt }} - name: Remove ${{ matrix.build }}:${{ matrix.arch }} cache env: @@ -639,7 +639,7 @@ jobs: uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0 with: path: ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}_digest - key: ${{ env.BASE_BUILD_NAME }}-${{ matrix.arch }}-${{ github.run_id }} + key: ${{ env.BASE_BUILD_NAME }}-${{ matrix.arch }}-${{ github.run_id }}-{{ github.run_attempt }} - name: Remove ${{ env.BASE_BUILD_NAME }}:${{ matrix.arch }} cache