AlmaLinux Kitten 10 support AlmaLinux#18

yuravk · Oct 29, 2024 · e5984d2 · e5984d2
1 parent 7c32aee
commit e5984d2
Showing 1 changed file with 16 additions and 21 deletions.
diff --git a/.github/workflows/build-media.yml b/.github/workflows/build-media.yml
@@ -114,11 +114,11 @@ jobs:
         dnf_crb_repo="CRB"
         need_pkgs="lorax lorax-templates-almalinux anaconda zstd"
         vm_box='almalinux/${{ inputs.version_major }}'
-        volume_id_root=${{ inputs.version_major }}${{ env.version_minor }} && volume_id_root=${volume_id_root//./_}
-        iso_name_root=${{ inputs.version_major }}${{ env.version_minor }}
+        iso_name_var=volume_id_var=${{ inputs.version_major }}${{ env.version_minor }} && volume_id_var=${volume_id_var//./_}
+        # iso_name_part=${{ inputs.version_major }}${{ env.version_minor }}
         livemedia_creator_opts=
         arch=x86_64
-        kickstart_arch=
+        kickstart_var=
 
         case ${{ matrix.variant }} in
           8)
@@ -131,20 +131,19 @@ jobs:
           10-kitten)
             need_pkgs="${need_pkgs} libblockdev-nvme"
             vm_box='lkhn/almalinux-kitten'
-            volume_id_root=10
-            iso_name_root=Kitten-10-${date_stamp}.0
+            volume_id_var=10
+            iso_name_part=Kitten-10-${date_stamp}.0
             ;;
           10-kitten-x86_64_v2)
             need_pkgs="${need_pkgs} libblockdev-nvme"
             vm_box='lkhn/almalinux-kitten-x86-64-v2'
-            volume_id_root=10
-            iso_name_root=Kitten-10-${date_stamp}.0
+            volume_id_var=10
+            iso_name_part=Kitten-10-${date_stamp}.0
             arch=x86_64_v2
-            kickstart_arch="-${arch}"
+            kickstart_var="-${arch}"
             ;;
           10)
             need_pkgs="${need_pkgs} libblockdev-nvme"
-            livemedia_creator_opts=
             ;;
           *)
 
@@ -161,17 +160,9 @@ jobs:
         # Architecture
         echo "arch=${arch}" >> $GITHUB_ENV
 
-        # Verify that CPU supports hardware virtualization
-        echo -n "Number of vmx|svm CPUs: " && grep -E -c '(vmx|svm)' /proc/cpuinfo
-
-        # Set ENV variable of for vagrant's config.vm.box
-        cp -av ci/vagrant/Vagrantfile ./
-        echo vm_box=${vm_box} > .env
-
         # Kickstart file name
         image_type=${{ matrix.image_types }}
-        image_type="${image_type,,}"
-        kickstart="almalinux-${{ inputs.version_major }}${kickstart_arch}-live-${image_type}.ks"
+        kickstart="almalinux-${{ inputs.version_major }}${kickstart_var}-live-${image_type,,}.ks"
         echo "kickstart=${kickstart}" >> $GITHUB_ENV
         echo "[Debug]: Kickstart file: ${kickstart}"
 
@@ -180,13 +171,13 @@ jobs:
         echo "livemedia_resultdir=${livemedia_resultdir}" >> $GITHUB_ENV
 
         # Volume ID
-        volid="AlmaLinux-${volume_id_root}-${arch}-Live-${{ matrix.image_types }}"
-        echo ${{ matrix.image_types }} | grep -i mini >/dev/null && volid="AlmaLinux-${volume_id_root}-${arch}-Live-Mini"
+        volid="AlmaLinux-${volume_id_var}-${arch}-Live-${{ matrix.image_types }}"
+        echo ${{ matrix.image_types }} | grep -i mini >/dev/null && volid="AlmaLinux-${volume_id_var}-${arch}-Live-Mini"
         echo "volid=${volid}" >> $GITHUB_ENV
         echo "[Debug] Volume ID: ${volid}"
 
         # Results file base name
-        results_name="AlmaLinux-${iso_name_root}-${arch}-Live-${{ matrix.image_types }}"
+        results_name="AlmaLinux-${iso_name_part}-${arch}-Live-${{ matrix.image_types }}"
         echo "results_name=${results_name}" >> $GITHUB_ENV
         echo "[Debug] ISO name: ${results_name}.iso"
 
@@ -199,6 +190,10 @@ jobs:
         mkdir -p ${results_path}
         echo "results_path=${results_path}" >> $GITHUB_ENV
 
+        # Set ENV variable of for vagrant's config.vm.box
+        cp -av ci/vagrant/Vagrantfile ./
+        echo vm_box=${vm_box} > .env
+
     - name: Create media creator script
       run: |
         cat <<'EOF'>./livemedia-creator.sh