CI for AlmaLinux 10.0

yuravk · Dec 16, 2024 · 4e82002 · 4e82002
1 parent 8bfc268
commit 4e82002
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/.github/workflows/almalinux-compose-test-arm64.yml b/.github/workflows/almalinux-compose-test-arm64.yml
@@ -7,9 +7,10 @@ on:
         version_major:
           description: 'AlmaLinux major version'
           required: true
-          default: '9'
+          default: '10'
           type: choice
           options:
+            - 10
             - 9
             - 8
 
@@ -72,7 +73,6 @@ jobs:
         pulp_root=${{ inputs.version_major }}
         tmt_options=
         rpm_gpg_key=/etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux
-        vm_box=almalinux/${{ inputs.version_major }}
         release_version=${{ inputs.version_major }}
         dnf_crb_repo='CRB'
 
@@ -84,8 +84,11 @@ jobs:
             tmt_options='--feeling-safe'
             rpm_gpg_key="${rpm_gpg_key}-9"
             ;;
+          10)
+            tmt_options='--feeling-safe'
+            rpm_gpg_key="${rpm_gpg_key}-10"
+            ;;
           10-kitten)
-            vm_box=lkhn/almalinux-kitten
             release_version=10
             pulp_root=kitten-10
             pungi_latest_result="${pungi_latest_result}_almalinux-kitten"
@@ -178,10 +181,19 @@ jobs:
       run: |
         enable_repo=${{ env.dnf_crb_repo }}
         case ${{ inputs.version_major }} in
-          10-kitten*)
+          10-kitten)
             sudo dnf install -y --enablerepo='extras-common' almalinux-kitten-release-devel
-            sudo dnf install -y --enablerepo='${enable_repo,,} devel' python3-pip beakerlib
-            sudo sh -c 'export PATH=$PATH:/usr/local/bin; pip install flexparser==0.3.1 tmt'
+            sudo dnf install -y --enablerepo="${enable_repo,,} devel" python3-pip beakerlib
+            sudo sh -c 'export PATH=$PATH:/usr/local/bin; pip install flexparser==0.3.1 tmt initscripts-service'
+            ;;
+          10)
+            sudo dnf config-manager --add-repo https://build.almalinux.org/pulp/content/builds/AlmaLinux-Kitten-10-aarch64-20670-br/
+            sudo dnf install -y --enablerepo="${enable_repo,,} extras" python3-pip beakerlib initscripts-service
+            sudo sh -c  'export PATH=$PATH:/usr/local/bin; pip install flexparser==0.3.1 tmt'
+            ;;
+          9)
+            sudo dnf -y install epel-release
+            sudo dnf install -y --enablerepo=${enable_repo,,} tmt initscripts-service
             ;;
           *)
             sudo dnf -y install epel-release

diff --git a/.github/workflows/almalinux-compose-test-x86_64.yml b/.github/workflows/almalinux-compose-test-x86_64.yml
@@ -7,10 +7,11 @@ on:
         version_major:
           description: 'AlmaLinux major version'
           required: true
-          default: '10-kitten'
+          default: '10'
           type: choice
           options:
             - 10-kitten
+            - 10
             - 9
             - 8
 
@@ -34,7 +35,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        variant: ${{ fromJSON(format('["{0}"]', ( inputs.version_major == '10-kitten' && '10-kitten", "10-kitten-x86_64_v2' || inputs.version_major ) )) }}
+        variant: ${{ fromJSON(format('["{0}"]', ( inputs.version_major == '10-kitten' && '10-kitten", "10-kitten-x86_64_v2' || ( inputs.version_major == '10' && '10", "10-x86_64_v2' || inputs.version_major ) ) )) }}
 
     steps:
     - uses: actions/checkout@v4
@@ -58,6 +59,16 @@ jobs:
             tmt_options='--feeling-safe'
             rpm_gpg_key="${rpm_gpg_key}-9"
             ;;
+          10)
+            vm_box=lkhn/almalinux-10
+            tmt_options='--feeling-safe'
+            rpm_gpg_key="${rpm_gpg_key}-10"
+            ;;
+          10-x86_64_v2)
+            vm_box=yuravk/almalinux-10-x86-64-v2
+            tmt_options='--feeling-safe'
+            rpm_gpg_key="${rpm_gpg_key}-10"
+            ;;
           10-kitten)
             vm_box=lkhn/almalinux-kitten
             release_version=10
@@ -219,6 +230,12 @@ jobs:
             sudo vagrant ssh almalinux -c "sudo dnf install -y --enablerepo='${enable_repo,,} devel' python3-pip beakerlib"
             sudo vagrant ssh almalinux -c "sudo sh -c  'export PATH=$PATH:/usr/local/bin; pip install flexparser==0.3.1 tmt'"
             ;;
+          10*)
+            [ "${{ matrix.variant }}" = "10" ] && basearch=x86_64 || basearch=x86_64_v2
+            sudo vagrant ssh almalinux -c "sudo dnf config-manager --add-repo https://build.almalinux.org/pulp/content/builds/AlmaLinux-Kitten-10-${basearch}-20670-br/"
+            sudo vagrant ssh almalinux -c "sudo dnf install -y --enablerepo='${enable_repo,,} extras' python3-pip beakerlib initscripts-service"
+            sudo vagrant ssh almalinux -c "sudo sh -c  'export PATH=$PATH:/usr/local/bin; pip install flexparser==0.3.1 tmt'"
+            ;;
           9)
             sudo vagrant ssh almalinux -c "sudo dnf -y install epel-release"
             sudo vagrant ssh almalinux -c "sudo dnf install -y --enablerepo=${enable_repo,,} tmt initscripts-service"