From 10eb78baf3915b897d1896c070bed16c9fd449d1 Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jim@acmegating.com>
Date: Wed, 5 Feb 2025 11:33:39 -0800
Subject: [PATCH] Add ubuntu jammy and noble images

Change-Id: Ie46aa2f46ed56c9e277b825a82a38b4c9c05b88e
---
 zuul.d/image-build-jobs.yaml | 53 ++++++++++++++++++++++++++++++++++++
 zuul.d/images.yaml           |  8 ++++++
 zuul.d/labels.yaml           | 30 ++++++++++++++++++++
 zuul.d/providers.yaml        | 22 +++++++++++++++
 4 files changed, 113 insertions(+)

diff --git a/zuul.d/image-build-jobs.yaml b/zuul.d/image-build-jobs.yaml
index d29a67c..adf8ac4 100644
--- a/zuul.d/image-build-jobs.yaml
+++ b/zuul.d/image-build-jobs.yaml
@@ -96,3 +96,56 @@
                       fstab:
                         options: "defaults,nobarrier,noatime"
                         fsck-passno: 1
+
+- job:
+    name: opendev-build-diskimage-ubuntu-jammy
+    description: |
+      Build the OpenDev Ubuntu jammy VM image
+    parent: opendev-build-diskimage-base-debuntu
+    image-build-name: ubuntu-jammy
+    vars:
+      build_diskimage_image_name: ubuntu-jammy
+      build_diskimage_elements:
+        - *base_elements
+        - ubuntu-minimal
+        - cache-devstack
+      build_diskimage_environment:
+        DIB_RELEASE: 'jammy'
+        DIB_DISTRIBUTION_MIRROR: 'https://{{ zuul_site_mirror_fqdn }}/ubuntu'
+        DIB_DEBIAN_COMPONENTS: 'main,universe'
+        # NOTE(ianw) 2022-05-20 : we have found a problem on some cloud
+        # providers (OVH at least) where setting SSBD mitigation flags
+        # seems to be disabled and this causes endless kernel tracebacks
+        # from writing invalid flags into MSR registers, flooding the
+        # logs.  By default spec_store_bypass_disable is set to
+        # "seccomp" which means the kernel forces every seccomp() call
+        # into this.  Setting it to prctl means userspace has to opt-in
+        # with an explicit call.  This is actually the default on more
+        # recent kernels; the reasons are many but the bug [1] goes
+        # through it with links to relevant changes.
+        #
+        # While we try and sort out either backporting this to upstream
+        # kernels or some other upstream workaround, we set
+        # spec_store_bypass_disable=prctl here to avoid this problem in
+        # our providers.  The other bits are just the dib defaults which
+        # need to be replicated when overriding this.
+        #
+        # [1] https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1973839
+        DIB_BOOTLOADER_DEFAULT_CMDLINE: 'nofb nomodeset gfxpayload=text spec_store_bypass_disable=prctl'
+
+- job:
+    name: opendev-build-diskimage-ubuntu-noble
+    description: |
+      Build the OpenDev Ubuntu noble VM image
+    parent: opendev-build-diskimage-base-debuntu
+    image-build-name: ubuntu-noble
+    vars:
+      build_diskimage_image_name: ubuntu-noble
+      build_diskimage_elements:
+        - *base_elements
+        - ubuntu-minimal
+        - cache-devstack
+      build_diskimage_environment:
+        DIB_RELEASE: 'noble'
+        DIB_DISTRIBUTION_MIRROR: 'https://{{ zuul_site_mirror_fqdn }}/ubuntu'
+        DIB_DEBIAN_COMPONENTS: 'main,universe'
diff --git a/zuul.d/images.yaml b/zuul.d/images.yaml
index 3d96def..b6f7c3c 100644
--- a/zuul.d/images.yaml
+++ b/zuul.d/images.yaml
@@ -1,3 +1,11 @@
 - image:
     name: debian-bullseye
     type: zuul
+
+- image:
+    name: ubuntu-jammy
+    type: zuul
+
+- image:
+    name: ubuntu-noble
+    type: zuul
diff --git a/zuul.d/labels.yaml b/zuul.d/labels.yaml
index 07496b6..7af9ead 100644
--- a/zuul.d/labels.yaml
+++ b/zuul.d/labels.yaml
@@ -20,3 +20,33 @@
     name: niz-debian-bullseye-16GB
     image: debian-bullseye
     flavor: 16GB
+
+- label:
+    name: niz-ubuntu-jammy-4GB
+    image: ubuntu-jammy
+    flavor: 4GB
+
+- label:
+    name: niz-ubuntu-jammy-8GB
+    image: ubuntu-jammy
+    flavor: 8GB
+
+- label:
+    name: niz-ubuntu-jammy-16GB
+    image: ubuntu-jammy
+    flavor: 16GB
+
+- label:
+    name: niz-ubuntu-noble-4GB
+    image: ubuntu-noble
+    flavor: 4GB
+
+- label:
+    name: niz-ubuntu-noble-8GB
+    image: ubuntu-noble
+    flavor: 8GB
+
+- label:
+    name: niz-ubuntu-noble-16GB
+    image: ubuntu-noble
+    flavor: 16GB
diff --git a/zuul.d/providers.yaml b/zuul.d/providers.yaml
index 2898ddf..1c94585 100644
--- a/zuul.d/providers.yaml
+++ b/zuul.d/providers.yaml
@@ -22,6 +22,8 @@
         flavor-name: gp.0.4.16
     images:
       - name: debian-bullseye
+      - name: ubuntu-jammy
+      - name: ubuntu-noble
 
 - section:
     name: raxflex-sjc3
@@ -40,6 +42,20 @@
         key-name: infra-root-keys-2024-04-08
       - name: niz-debian-bullseye-16GB
         key-name: infra-root-keys-2024-04-08
+      # jammy
+      - name: niz-ubuntu-jammy-4GB
+        key-name: infra-root-keys-2024-04-08
+      - name: niz-ubuntu-jammy-8GB
+        key-name: infra-root-keys-2024-04-08
+      - name: niz-ubuntu-jammy-16GB
+        key-name: infra-root-keys-2024-04-08
+      # noble
+      - name: niz-ubuntu-noble-4GB
+        key-name: infra-root-keys-2024-04-08
+      - name: niz-ubuntu-noble-8GB
+        key-name: infra-root-keys-2024-04-08
+      - name: niz-ubuntu-noble-16GB
+        key-name: infra-root-keys-2024-04-08
 
 # Vexxhost
 - section:
@@ -54,6 +70,8 @@
         flavor-name: v3-standard-4
     images:
       - name: debian-bullseye
+      - name: ubuntu-jammy
+      - name: ubuntu-noble
 
 - section:
     name: vexxhost-ca-ymq-1
@@ -66,3 +84,7 @@
     labels:
       - name: niz-debian-bullseye-16GB
         key-name: infra-root-keys-2024-04-08
+      - name: niz-ubuntu-jammy-16GB
+        key-name: infra-root-keys-2024-04-08
+      - name: niz-ubuntu-noble-16GB
+        key-name: infra-root-keys-2024-04-08