Fix ohpc 4.5 changes

Add matrix for Alma
UoB-HPC · Dec 1, 2024 · a97bdd7 · a97bdd7
1 parent 8569b41
commit a97bdd7
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 5 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -54,6 +54,14 @@ jobs:
 
   test-deploy:
     runs-on: ubuntu-24.04
+    continue-on-error: true
+    strategy:
+      matrix:
+        alma:
+          - { version: "9.4", build: "20240805" }
+          - { version: "9.5", build: "20241120" }
+        opnsense:
+          - { version: "24.7" }
     steps:
       - { name: Stats, run: df -H && sudo fstrim -av, if: always() }
 
@@ -146,17 +154,17 @@ jobs:
 
       - name: Create opnsense image
         working-directory: images
-        run: make opnsense.qcow2
+        run: make OPNSENSE_VERSION=${{ matrix.opnsense.version }} ALMA_VERSION=${{ matrix.alma.version }} ALMA_BUILD=${{ matrix.alma.build }} opnsense.qcow2
         if: always()
 
       - name: Build x86_64 bos/cos images
         working-directory: images
-        run: make bos.x86_64.qcow2 cos.plain.x86_64.warewulf.tar -j
+        run: make OPNSENSE_VERSION=${{ matrix.opnsense.version }} ALMA_VERSION=${{ matrix.alma.version }} ALMA_BUILD=${{ matrix.alma.build }} bos.x86_64.qcow2 cos.plain.x86_64.warewulf.tar -j
         if: always()
 
       - name: Build aarch64 bos/cos images
         working-directory: images
-        run: make bos.aarch64.qcow2 cos.plain.aarch64.warewulf.tar -j
+        run: make OPNSENSE_VERSION=${{ matrix.opnsense.version }} ALMA_VERSION=${{ matrix.alma.version }} ALMA_BUILD=${{ matrix.alma.build }} bos.aarch64.qcow2 cos.plain.aarch64.warewulf.tar -j
         if: always()
 
       - name: Image stats

diff --git a/playbook-svc-mgmt.yml b/playbook-svc-mgmt.yml
@@ -352,6 +352,10 @@
         state: absent
         path: /etc/root.keytab
 
+    - name: Install pexpect
+      ansible.builtin.dnf:
+        name: ["python3-pexpect"]
+
     - name: Create root user keytab
       ansible.builtin.expect:
         command: ktutil

diff --git a/scripts/build-arch-overlays.sh b/scripts/build-arch-overlays.sh
@@ -13,8 +13,19 @@ extract_wwclient_for_arch() {
         dnf download "warewulf-ohpc.$arch"
         rpm2cpio warewulf-ohpc*."$arch".rpm | cpio -idm
 
-        cp "./srv/warewulf/overlays/wwinit/warewulf/wwclient" "$dest/wwclient"
-        file "$dest/wwclient"
+        # warewulf-ohpc >= 4.5.0 has an extra rootfs/ segment in the wwclient path
+        for src in \
+            "./srv/warewulf/overlays/wwinit/warewulf/wwclient" \
+            "./srv/warewulf/overlays/wwinit/rootfs/warewulf/wwclient"; do
+            if [[ -e "$src" ]]; then
+                cp "$src" "$dest/wwclient"
+                file "$dest/wwclient"
+                break
+            fi
+        done || {
+            echo "Error: wwclient not found in any expected paths." >&2
+            exit 1
+        }
     )
     rm -rf "$wd"
 }