feat: Add building ubuntu image

rackerlabs · Oct 18, 2024 · 9732597 · 9732597
1 parent 20f2632
commit 9732597
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 16 deletions.
diff --git a/.github/workflows/build-ironic-images.yaml b/.github/workflows/build-ironic-images.yaml
@@ -15,35 +15,60 @@ on:
     types: [checks_requested]
 
 jobs:
-  build-ironic-images:
+  build:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ironic-images/ipa-debian-bookworm
+    strategy:
+      matrix:
+        image:
+          - name: "ubuntu"
+            release: "noble"
+          - name: "debian"
+            release: "ipa-debian-bookworm"
     steps:
-      - uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
-      - uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
+      - name: Checkout repository
+        uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4
+
+      - name: Setup python environment
+        uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5
         id: setup-python
         with:
           python-version: '3.11'
           cache: 'pip'
-      - run: sudo apt update && sudo apt install -y debootstrap qemu-utils
-      - run: pip install -r requirements.txt
+
+      - name: Install Dependencies
+        run: sudo apt update && sudo apt install -y debootstrap qemu-utils squashfs-tools kpartx
+
+      - name: Install python packages
+        run: pip install -r requirements.txt
         working-directory: ironic-images
-      - name: Build the IPA image
-        run: bash ipa-debian-bookworm.sh
+
+      - name: Build Images
+        run: |
+          bash "${{ matrix.image.name == 'ubuntu' && format('{0}.sh', matrix.image.name) || format('{0}.sh', matrix.image.release) }}"
+          if [ "${{ matrix.image.name }}" == "ubuntu" ]; then
+            echo "qcow2_file=ironic-images/${{ matrix.image.name }}/${{ matrix.image.name }}-${{ matrix.image.release }}.qcow2" >> $GITHUB_ENV
+          elif [ "${{ matrix.image.name }}" == "debian" ]; then
+            echo "initramfs_file=ironic-images/${{ matrix.image.release }}/${{ matrix.image.release }}.initramfs" >> $GITHUB_ENV
+            echo "kernel_file=ironic-images/${{ matrix.image.release }}/${{ matrix.image.release }}.kernel" >> $GITHUB_ENV
+          fi
+        working-directory: "${{ matrix.image.name == 'ubuntu' && format('ironic-images/{0}', matrix.image.name) || format('ironic-images/{0}', matrix.image.release) }}"
         env:
-          ELEMENTS_PATH: ${{ env.pythonLocation }}/share/ironic-python-agent-builder/dib:${{ github.workspace }}/ironic-images/custom_elements
-      - name: Dynamically set timestamp environment variable
-        run: echo "TIMESTAMP=$(date +"%Y%m%d%H%M%S")" >> $GITHUB_ENV
-      - name: Publish IPA Release
+          # OS_VERSION variable used in ironic-images/ubuntu/ubuntu.sh
+          OS_VERSION: ${{ matrix.image.release }}
+          ELEMENTS_PATH: "${{ matrix.image.name == 'ubuntu' && '' || format('{0}/share/ironic-python-agent-builder/dib:{1}/ironic-images/custom_elements', env.pythonLocation, github.workspace) }}"
+
+      - name: Set timestamp environment variable
+        run: echo "TIMESTAMP=$(git show --no-patch --no-notes --pretty='%cd' --date=format:'%Y%m%d%H%M%S' ${{ github.sha }})" >>  $GITHUB_ENV
+
+      - name: Publish Release
         uses: softprops/action-gh-release@c062e08bd532815e2082a85e87e3ef29c3e6d191 # v2
         with:
           name: undercloud-ironic-ipa
           tag_name: undercloud-ironic-ipa-${{ env.TIMESTAMP }}
           make_latest: true
           fail_on_unmatched_files: true
           files: |
-            ironic-images/ipa-debian-bookworm/ipa-debian-bookworm.initramfs
-            ironic-images/ipa-debian-bookworm/ipa-debian-bookworm.kernel
+            ${{ env.qcow2_file }}
+            ${{ env.initramfs_file }}
+            ${{ env.kernel_file }}
         if: ${{ github.ref == 'refs/heads/main' }}
diff --git a/ironic-images/ubuntu/ubuntu.sh b/ironic-images/ubuntu/ubuntu.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# ubuntu version
+export DIB_RELEASE="${OS_VERSION:-noble}"
+
+# devuser element - https://github.com/openstack/diskimage-builder/tree/master/diskimage_builder/elements/devuser
+[[ -n $OS_VERSION ]] && sed -i -e "s|ubuntu-noble|ubuntu-${OS_VERSION}|" ubuntu.yaml
+diskimage-builder ubuntu.yaml
diff --git a/ironic-images/ubuntu/ubuntu.yaml b/ironic-images/ubuntu/ubuntu.yaml
@@ -0,0 +1,11 @@
+- imagename: ubuntu-noble
+  elements:
+  - ubuntu
+  - grub2
+  - block-device-efi
+  - devuser
+  - dynamic-login
+  - simple-init
+  - baremetal
+  - bootloader
+  - package-installs