CI (github-hosted): add support for 10-kitten

Author: metalefty

.github/workflows/build-rpi-github-hosted.yml

@@ -34,6 +34,7 @@ on:
         default: '9'
         type: choice
         options:
+          - 10k
           - 9
           - 8
 
@@ -72,6 +73,9 @@ jobs:
           # 8 has no GPT image
           - version_major: '8'
             partitioning: 'gpt'
+          # 10-kitten has no MBR image
+          - version_major: '10k'
+            partitioning: 'mbr'
 
     steps:
     - uses: actions/checkout@v4
@@ -83,9 +87,26 @@ jobs:
 
     - name: Prepare AlmaLinux Minor version number
       run: |
-        release=$(rpm -q --qf="%{VERSION}\n" https://repo.almalinux.org/almalinux/almalinux-release-latest-${{ inputs.version_major }}.aarch64.rpm 2>/dev/null)
+        version_major=${{ inputs.version_major }}
+        version_major=${version_major%k}
+        case ${{ inputs.version_major }} in
+          *k) ## Kitten
+            release_url="https://repo.almalinux.org/almalinux-kitten/almalinux-kitten-release-latest-${version_major}.aarch64.rpm"
+            container_version="${version_major}-kitten"
+            kitten="Kitten"
+            ;;
+          *)
+            release_url="https://repo.almalinux.org/almalinux/almalinux-release-latest-${version_major}.aarch64.rpm"
+            container_version="${version_major}"
+            ;;
+        esac
+        release=$(rpm -q --qf="%{VERSION}\n" ${release_url} 2>/dev/null)
         version_minor=$(cut -d '.' -f 2 <<< "$release")
+        [ "x${kitten}" != "x" ] && echo "kitten=${kitten} " >> $GITHUB_ENV
+        [ "x${release}" != "x" ] && echo "full_release_version=${release}" >> $GITHUB_ENV
+        [ "x${version_major}" != "x" ] && echo "version_major=${version_major}" >> $GITHUB_ENV
         [ "x${version_minor}" != "x" ] && echo "version_minor=${version_minor}" >> $GITHUB_ENV
+        [ "x${container_version}" != "x" ] && echo "container_version=${container_version}" >> $GITHUB_ENV
 
     - name: Prepare some environment stuff
       run: |
@@ -97,7 +118,7 @@ jobs:
           9)
             python3_imgcreate=/usr/lib/python3.9/site-packages/imgcreate/
             ;;
-          10)
+          10|10k)
             python3_imgcreate=/usr/lib/python3.12/site-packages/imgcreate/
             ;;
           *)
@@ -131,8 +152,8 @@ jobs:
         echo "rpi_image_resultdir=${rpi_image_resultdir}" >> $GITHUB_ENV
 
         # Image file base name
-        image_name="AlmaLinux-${{ inputs.version_major }}-RaspberryPi-${{ matrix.partitioning }}-${{ inputs.version_major }}.${{ env.version_minor }}-${date_stamp}.aarch64"
-        [ "${{ matrix.image_types }}" = "gnome" ] && image_name="AlmaLinux-${{ inputs.version_major }}-RaspberryPi-GNOME-${{ matrix.partitioning }}-${{ inputs.version_major }}.${{ env.version_minor }}-${date_stamp}.aarch64"
+        image_name="AlmaLinux-${{ inputs.version_major }}-RaspberryPi-${{ matrix.partitioning }}-${{ env.full_release_version }}-${date_stamp}.aarch64"
+        [ "${{ matrix.image_types }}" = "gnome" ] && image_name="AlmaLinux-${{ inputs.version_major }}-RaspberryPi-GNOME-${{ matrix.partitioning }}-${{ env.full_release_version }}-${date_stamp}.aarch64"
         echo "image_name=${image_name}" >> $GITHUB_ENV
 
     - name: Install KVM and libvirt packages
@@ -193,7 +214,7 @@ jobs:
 
         # Docerfile to build image for RPi creation
         cat << 'EOF' > Dockerfile
-        FROM almalinux:${{ inputs.version_major }}
+        FROM almalinux:${{ env.container_version }}
 
         # Set the working directory in the container
         WORKDIR /
@@ -442,7 +463,7 @@ jobs:
         MATTERMOST_CHANNEL: ${{ vars.MATTERMOST_CHANNEL }}
         MATTERMOST_USERNAME: ${{ github.triggering_actor }}
         TEXT: |
-          **AlmaLinux OS ${{ inputs.version_major }}.${{ env.version_minor }} Raspberry Pi image Build** `${{ env.date_time_stamp }}` generated by the GitHub [Action](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+          **AlmaLinux OS ${{ env.kitten }}${{ env.full_release_version }} Raspberry Pi image Build** `${{ env.date_time_stamp }}` generated by the GitHub [Action](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
           :almalinux: **${{ matrix.image_types }} ${{ matrix.partitioning }}**
 
@@ -458,7 +479,7 @@ jobs:
         MATTERMOST_CHANNEL: ${{ vars.MATTERMOST_CHANNEL }}
         MATTERMOST_USERNAME: ${{ github.triggering_actor }}
         TEXT: |
-          **AlmaLinux OS ${{ inputs.version_major }}.${{ env.version_minor }} Raspberry Pi image Build** `${{ env.date_time_stamp }}` generated by the GitHub [Action](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
+          **AlmaLinux OS ${{ env.kitten }}${{ env.full_release_version}} Raspberry Pi image Build** `${{ env.date_time_stamp }}` generated by the GitHub [Action](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
           :almalinux: **${{ matrix.image_types }} ${{ matrix.partitioning }}**