From 010787a57806b9d73b89abf6ca78504323ae468b Mon Sep 17 00:00:00 2001
From: Alexey Pustovalov <alexey.pustovalov@zabbix.com>
Date: Thu, 15 Feb 2024 18:23:19 +0900
Subject: [PATCH] RHEL build test

---
 .github/workflows/images_build_rhel.yml | 41 +++++++++++--------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/images_build_rhel.yml b/.github/workflows/images_build_rhel.yml
index 99e6fa83c..31d32ce26 100644
--- a/.github/workflows/images_build_rhel.yml
+++ b/.github/workflows/images_build_rhel.yml
@@ -198,29 +198,25 @@ jobs:
             ${{ env.DOCKERFILES_DIRECTORY }}/${{ matrix.build }}/rhel/Dockerfile
           extra-args: |
             --pull
-            --iidfile=./iidfile
+            --iidfile=$HOME/iidfile
 
       - name: Image digest
         env:
           IMAGE_TAG: ${{ steps.build_image.outputs.image-with-tag }}
           CACHE_FILE_NAME: ${{ env.BASE_BUILD_NAME }}_${{ matrix.arch }}
         run: |
-            DIGEST=$(podman inspect "${IMAGE_TAG}" --format "{{ index .RepoDigests 0}}" | cut -d '@' -f2)
-            TAG_ID=$(podman inspect "${IMAGE_TAG}" --format "{{ .Id }}")
-
-            cat ./iidfile
+            TAG_ID=$(cat $HOME/iidfile)
 
             echo "::group::Image tag"
             echo "image_tag=$IMAGE_TAG"
             echo "::endgroup::"
-            echo "::group::Image digest"
-            echo "digest=$DIGEST"
+            echo "::group::Image Tag ID"
+            echo "tag_id=$TAG_ID"
             echo "::endgroup::"
             echo "::group::Cache file name"
             echo "$CACHE_FILE_NAME"
             echo "::endgroup::"
 
-            echo "$DIGEST" > "${CACHE_FILE_NAME}_digest"
             echo "$TAG_ID" > "${CACHE_FILE_NAME}_tag_id"
             echo "$IMAGE_TAG" > "${CACHE_FILE_NAME}_tag"
 
@@ -228,7 +224,6 @@ jobs:
         uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: |
-              ${{ 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 }}-${{ github.run_attempt }}
@@ -238,14 +233,15 @@ jobs:
           IMAGE_TAG: ${{ steps.build_image.outputs.image-with-tag }}
           IMAGE_DIR: ${{ env.IMAGE_DIR }}
         run: |
-            DIGEST=$(podman inspect "${IMAGE_TAG}" --format "{{ index .RepoDigests 0}}" | cut -d '@' -f2)
+            TAG_ID=$(cat $HOME/iidfile)
 
             echo "::group::Result"
-            echo "podman push \"${IMAGE_TAG}\" dir:\"${IMAGE_DIR}/${DIGEST}\""
-            podman push "${IMAGE_TAG}" dir:"${IMAGE_DIR}/${DIGEST}"
+            echo "podman push \"${IMAGE_TAG}\" dir:\"${IMAGE_DIR}/${TAG_ID}\""
+            podman push "${IMAGE_TAG}" dir:"${IMAGE_DIR}/${TAG_ID}"
             echo "::endgroup::"
 
       - name: Post build image
+        if: {{ success() || failure() }}
         env:
           IMAGE_TAG: ${{ steps.build_image.outputs.image-with-tag }}
         run: |
@@ -297,7 +293,6 @@ jobs:
         uses: actions/cache/restore@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
         with:
           path: |
-              ${{ 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 }}-${{ github.run_attempt }}
@@ -309,14 +304,14 @@ jobs:
          BASE_IMAGE: ${{ env.BASE_BUILD_NAME }}
          IMAGES_PREFIX: ${{ env.IMAGES_PREFIX }}
         run: |
-            BASE_TAG=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}_digest")
-            BUILD_BASE_IMAGE="${IMAGES_PREFIX}${BASE_IMAGE}@${BASE_TAG}"
+            BASE_TAG_ID=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}_tag_id")
+            BUILD_BASE_IMAGE="${IMAGES_PREFIX}${BASE_IMAGE}@${BASE_TAG_ID}"
 
             echo "::group::Base build image information"
             echo "base_build_image=${BUILD_BASE_IMAGE}"
             echo "::endgroup::"
 
-            echo "base_tag=${BASE_TAG}" >> $GITHUB_OUTPUT
+            echo "base_tag_id=${BASE_TAG_ID}" >> $GITHUB_OUTPUT
             echo "base_build_image=${BUILD_BASE_IMAGE}" >> $GITHUB_OUTPUT
 
       - name: Pull ${{ env.BASE_BUILD_NAME }}:${{ matrix.arch }} image
@@ -325,15 +320,14 @@ jobs:
          BASE_IMAGE: ${{ env.BASE_BUILD_NAME }}
          IMAGES_PREFIX: ${{ env.IMAGES_PREFIX }}
         run: |
-            BASE_DIGEST=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}_digest")
-            BASE_TAG=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}_tag_id")
+            BASE_TAG_ID=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}_tag_id")
             BUILD_BASE_IMAGE=$(cat "${BASE_IMAGE}_${MATRIX_ARCH}_tag")
 
             echo "::group::Pull image"
-            echo "podman pull dir:\"${IMAGE_DIR}/${BASE_DIGEST}\""
-            podman pull dir:"${IMAGE_DIR}/${BASE_DIGEST}"
-            echo "podman tag \"${BASE_TAG}\" \"${BUILD_BASE_IMAGE}\""
-            podman tag "${BASE_TAG}" "${BUILD_BASE_IMAGE}"
+            echo "podman pull dir:\"${IMAGE_DIR}/${BASE_TAG_ID}\""
+            podman pull dir:"${IMAGE_DIR}/${BASE_TAG_ID}"
+            echo "podman tag \"${BASE_TAG_ID}\" \"${BUILD_BASE_IMAGE}\""
+            podman tag "${BASE_TAG_ID}" "${BUILD_BASE_IMAGE}"
             echo "::endgroup::"
 
       - name: Build Zabbix Build Base
@@ -391,6 +385,7 @@ jobs:
             echo "::endgroup::"
 
       - name: Post build image
+        if: {{ success() || failure() }}
         env:
           IMAGE_TAG: ${{ steps.build_image.outputs.image-with-tag }}
         run: |
@@ -596,7 +591,7 @@ jobs:
             echo "::endgroup::"
 
       - name: Post build image
-        if: ${{ always() }}
+        if: {{ success() || failure() }}
         env:
           TAGS: ${{ steps.meta.outputs.tags }}
         run: |