From f5b01d71b70c1d5e47b6a35160b3364e93d337de Mon Sep 17 00:00:00 2001
From: "Dr. Jens Harbott" <harbott@osism.tech>
Date: Fri, 22 Apr 2022 14:48:54 +0200
Subject: [PATCH] Start bulding ubuntu-jammy images

Jammy was released yesterday, we can start building images for it.

Change-Id: I5fd16df8bf0e3b74711875ad0573be69db12791b
---
 nodepool/elements/infra-package-needs/pkg-map       |  5 +++++
 .../post-install.d/80-enable-infra-services         | 10 +++++-----
 nodepool/nodepool.yaml                              | 13 +++++++++++++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/nodepool/elements/infra-package-needs/pkg-map b/nodepool/elements/infra-package-needs/pkg-map
index b52fe3a1a1..8b0ad4b951 100644
--- a/nodepool/elements/infra-package-needs/pkg-map
+++ b/nodepool/elements/infra-package-needs/pkg-map
@@ -26,6 +26,11 @@
         "ntp": "",
         "ntpdate": "",
         "python-dev": ""
+      },
+      "jammy": {
+        "ntp": "",
+        "ntpdate": "",
+        "python-dev": ""
       }
    }
   },
diff --git a/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services b/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services
index 72f65aac05..cac0d34ac1 100755
--- a/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services
+++ b/nodepool/elements/infra-package-needs/post-install.d/80-enable-infra-services
@@ -12,11 +12,11 @@ case "$DIB_INIT_SYSTEM" in
         exit 0
         ;;
     systemd)
-        if [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
-            # stick with default systemd timesyncd on focal
-            if [[ ${DIB_RELEASE} != 'focal' ]]; then
-                systemctl enable ntp.service
-            fi
+        # stick with default systemd timesyncd on focal and beyond
+        if [[ ":focal: :jammy:" =~ :${DIB_RELEASE}: ]]; then
+            exit 0
+        elif [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
+            systemctl enable ntp.service
         elif [[ ( $DISTRO_NAME == "centos" && $DIB_RELEASE > 7 ) || $DISTRO_NAME == "fedora" || $DISTRO_NAME == "rocky" ]]; then
             systemctl enable chronyd
         else
diff --git a/nodepool/nodepool.yaml b/nodepool/nodepool.yaml
index 95e0258896..955dce7aec 100644
--- a/nodepool/nodepool.yaml
+++ b/nodepool/nodepool.yaml
@@ -39,6 +39,8 @@ providers:
         config-drive: true
       - name: ubuntu-focal
         config-drive: true
+      - name: ubuntu-jammy
+        config-drive: true
       - name: ubuntu-xenial
         config-drive: true
       - name: openEuler-20-03-LTS-SP2
@@ -307,6 +309,17 @@ diskimages:
       DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu'
       DIB_DEBIAN_COMPONENTS: 'main,universe'
 
+  - name: ubuntu-jammy
+    parent: base-debuntu
+    pause: false
+    elements:
+      - ubuntu-minimal
+      - cache-devstack
+    release: jammy
+    env-vars:
+      DIB_DISTRIBUTION_MIRROR: 'http://mirror.dfw.rax.opendev.org/ubuntu'
+      DIB_DEBIAN_COMPONENTS: 'main,universe'
+
   - name: ubuntu-xenial
     parent: base-debuntu
     pause: false