Update actions-rootfs-builder.yml: Tests enhacement AlmaLinux#5

yuravk · Mar 15, 2024 · c0a9fc1 · c0a9fc1
1 parent a4fd1bb
commit c0a9fc1
Showing 1 changed file with 18 additions and 7 deletions.
diff --git a/.github/workflows/actions-rootfs-builder.yml b/.github/workflows/actions-rootfs-builder.yml
@@ -293,7 +293,7 @@ jobs:
           platforms="${{ inputs.platform }}"
           for platform in ${platforms//,/ }; do
 
-            echo "Testing ${{ inputs.major_version }} ${{ matrix.image_types }} ${platform} image"
+            echo "Testing ${{ inputs.major_version }} ${{ matrix.image_types }} ${platform} image:"
             run_arch=${platform#linux/}
             # docker run --platform=${platform} ${{ steps.build-images.outputs.imageid }} /bin/bash -c " \
 
@@ -302,15 +302,26 @@ jobs:
               x86_64amd64|ppc64leppc64le|s390xs390x|aarch64arm64)
                 true;;
               *)
-                echo " ${run_arch} doesn't match ${arch}"; false ;;
+                echo " - ${run_arch} doesn't match ${arch}" && false ;;
             esac
-            echo " ${run_arch} matches ${arch}"
+            echo " + ${run_arch} matches ${arch}"
 
             almalinux_release=$( docker run --platform=${platform} ${{ steps.build-images.outputs.digest }} /bin/bash -c "cat /etc/almalinux-release" )
-            [[ ${almalinux_release} = *'AlmaLinux release ${{ inputs.major_version }}'* ]] && echo " ${almalinux_release} matches" || false
-
-            docker run --platform=${platform} ${{ steps.build-images.outputs.digest }} /bin/bash -c " \
-            ( test "${{ matrix.image_types }}" != "micro" && rpm -q gpg-pubkey) || true "
+            if [[ ${almalinux_release} = *'AlmaLinux release ${{ inputs.major_version }}'* ]]; then
+              echo " + ${almalinux_release} matched"
+            else
+              echo " - ${almalinux_release} did not match" && false
+            fi
+
+            if [ "${{ matrix.image_types }}" != "micro" ]; then
+              gpg_pubkey=$( docker run --platform=${platform} ${{ steps.build-images.outputs.digest }} /bin/bash -c "rpm -q gpg-pubkey" )
+              if [ -n ${gpg_pubkey} ]; then
+                echo " + GPG KEYS:"
+                echo "${gpg_pubkey}"
+              else
+                echo "  GPG KEY not installed." && false
+              fi
+            fi
           done
 
       -