enable fatimage build on either RL8 or RL9, inc on PRs

Author: sjpb

.github/workflows/fatimage.yml

@@ -1,12 +1,26 @@
 
 name: Build fat image
-on:
+'on':
   workflow_dispatch:
+    inputs:
+      use_RL9:
+        required: true
+        description: Include RL9 image build
+        type: boolean
+        default: false
 jobs:
   openstack:
     name: openstack-imagebuild
-    concurrency: ${{ github.ref }} # to branch/PR
+    concurrency: ${{ github.ref }}-{{ matrix.os_version }} # to branch/PR + OS
     runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        os_version: [RL8, RL9]
+        rl9_selected:
+          - ${{ inputs.use_RL9 == true }} # only potentially true for workflow_dispatch
+        exclude:
+          - os_version: RL9
+            rl9_selected: false
     env:
       ANSIBLE_FORCE_COLOR: True
       OS_CLOUD: openstack
@@ -48,6 +62,8 @@ jobs:
           cd packer/
           packer init .
           PACKER_LOG=1 packer build -only openstack.openhpc -on-error=${{ vars.PACKER_ON_ERROR }} -var-file=$PKR_VAR_environment_root/${{ vars.CI_CLOUD }}.pkrvars.hcl openstack.pkr.hcl
+        env:
+          PKR_VAR_os_version: ${{ matrix.os_version }}
 
       - name: Get created image name from manifest
         id: manifest

environments/.stackhpc/ARCUS.pkrvars.hcl

@@ -1,10 +1,8 @@
 flavor = "vm.ska.cpu.general.small"
 use_blockstorage_volume = true
-volume_size = 12 # GB. Compatible with SMS-lab's general.v1.tiny 
+volume_size = 12 # GB. Compatible with SMS-lab's general.v1.tiny
 image_disk_format = "qcow2"
 networks = ["4b6b2722-ee5b-40ec-8e52-a6610e14cc51"] # portal-internal (DNS broken on ilab-60)
-source_image_name = "openhpc-230804-1754-80b8d714" # https://github.com/stackhpc/ansible-slurm-appliance/pull/298
-fatimage_source_image_name = "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]

environments/.stackhpc/LEAFCLOUD.pkrvars.hcl

@@ -4,8 +4,6 @@ volume_size = 12 # GB. Compatible with SMS-lab's general.v1.tiny
 volume_type = "unencrypted"
 image_disk_format = "qcow2"
 networks = ["909e49e8-6911-473a-bf88-0495ca63853c"] # slurmapp-ci
-source_image_name = "openhpc-230804-1754-80b8d714" # https://github.com/stackhpc/ansible-slurm-appliance/pull/298
-fatimage_source_image_name = "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
 ssh_keypair_name = "slurm-app-ci"
 ssh_private_key_file = "~/.ssh/id_rsa"
 security_groups = ["default", "SSH"]

packer/openstack.pkr.hcl

@@ -39,26 +39,26 @@ variable "networks" {
   type = list(string)
 }
 
-# Must supply either source_image_name or source_image
-variable "source_image_name" {
+# Must supply either fatimage_source_image_name or fatimage_source_image
+variable "os_version" {
   type = string
-  default = null
+  description = "RL8 or RL9"
 }
 
-variable "source_image" {
-  type = string
-  default = null
-}
-
-# Must supply either fatimage_source_image_name or fatimage_source_image
 variable "fatimage_source_image_name" {
-  type = string
-  default = null
+  type = map(string)
+  default = {
+    RL8: "Rocky-8-GenericCloud-Base-8.9-20231119.0.x86_64.qcow2"
+    RL9: "Rocky-9-GenericCloud-Base-9.3-20231113.0.x86_64.qcow2"
+  }
 }
 
 variable "fatimage_source_image" {
-  type = string
-  default = null
+  type = map(string)
+  default = {
+    RL8: null
+    RL9: null
+  }
 }
 
 variable "flavor" {
@@ -159,38 +159,13 @@ source "openstack" "openhpc" {
   image_visibility = "${var.image_visibility}"
 }
 
-# NB: build names, split on "-", are used to determine groups to add build to, so could build for a compute gpu group using e.g. `compute-gpu`.
-build {
-  source "source.openstack.openhpc" {
-    name = "compute"
-    source_image = "${var.source_image}"
-    source_image_name = "${var.source_image_name}" # NB: must already exist in OpenStack
-    image_name = "ohpc-${source.name}-${local.timestamp}-${substr(local.git_commit, 0, 8)}" # also provides a unique legal instance hostname (in case of parallel packer builds)
-  }
-
-  provisioner "ansible" {
-    playbook_file = "${var.repo_root}/ansible/site.yml"
-    groups = concat(["builder"], split("-", "${source.name}"))
-    keep_inventory_file = true # for debugging
-    use_proxy = false # see https://www.packer.io/docs/provisioners/ansible#troubleshooting
-    extra_arguments = ["--limit", "builder", "-i", "${var.repo_root}/packer/ansible-inventory.sh", "-vv", "-e", "@${var.repo_root}/packer/${source.name}_extravars.yml"]
-  }
-
-  post-processor "manifest" {
-    output = "${var.manifest_output_path}"
-    custom_data  = {
-      source = "${source.name}"
-    }
-  }
-}
-
 # The "fat" image build with all binaries:
 build {
   source "source.openstack.openhpc" {
     floating_ip_network = "${var.floating_ip_network}"
-    source_image = "${var.fatimage_source_image}"
-    source_image_name = "${var.fatimage_source_image_name}" # NB: must already exist in OpenStack
-    image_name = "${source.name}-${local.timestamp}-${substr(local.git_commit, 0, 8)}" # similar to name from slurm_image_builder
+    source_image = "${var.fatimage_source_image[var.os_version]}"
+    source_image_name = "${var.fatimage_source_image_name[var.os_version]}" # NB: must already exist in OpenStack
+    image_name = "${source.name}-${var.os_version}-${local.timestamp}-${substr(local.git_commit, 0, 8)}" # similar to name from slurm_image_builder
   }
 
   provisioner "ansible" {