From d95cc37fa8904fea9e457ed3f3d16e0296b9e0c4 Mon Sep 17 00:00:00 2001
From: Kienan Stewart <kstewart@efficios.com>
Date: Mon, 12 Feb 2024 13:33:42 -0500
Subject: [PATCH] jjb: Add job for building Ubuntu images

Change-Id: I3b59a30b461ab170073234cd0d7737e27c755875
Signed-off-by: Kienan Stewart <kstewart@efficios.com>
---
 jobs/images.yml                 | 39 +++++++++++++++++++++++++++++++++
 pipelines/images/distrobuild.sh |  2 +-
 pipelines/images/imagebuild.sh  |  2 +-
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/jobs/images.yml b/jobs/images.yml
index 56fafb3..04c91e7 100644
--- a/jobs/images.yml
+++ b/jobs/images.yml
@@ -294,6 +294,45 @@
           <<: *images_parameters_GIT_BRANCH
     jobs:
       - 'images_imagebuilder_{OS}'
+
+- project:
+    name: images_imagebuilder_ubuntu
+    OS:
+      - ubuntu
+    ARCHES:
+      - amd64
+    RELEASES:
+      - focal
+      - jammy
+      - noble
+    parameters:
+      - bool:
+          <<: *images_parameters_SKIP_BASE_IMAGES
+      - bool:
+          <<: *images_parameters_SKIP_PROFILE_IMAGES
+      - choice:
+          <<: *images_parameters_ARCH_FILTER
+          choices:
+            - all
+            - amd64
+      - choice:
+          <<: *images_parameters_IMAGE_TYPE_FILTER
+      - choice:
+          <<: *images_parameters_PROFILE_FILTER
+      - choice:
+          name: 'RELEASE_FILTER'
+          choices:
+            - 'all'
+            - 'focal'
+            - 'jammy'
+            - 'noble'
+      - string:
+          <<: *images_parameters_GIT_URL
+      - string:
+          <<: *images_parameters_GIT_BRANCH
+    jobs:
+      - 'images_imagebuilder_{OS}'
+
 - project:
     name: images_basejobs
     jobs:
diff --git a/pipelines/images/distrobuild.sh b/pipelines/images/distrobuild.sh
index 5dceb73..fea1d13 100644
--- a/pipelines/images/distrobuild.sh
+++ b/pipelines/images/distrobuild.sh
@@ -52,7 +52,7 @@ if [[ ! "${MISSING_VARS}" == "0" ]] ; then
 fi
 
 # Optional variables
-INSTANCE_START_TIMEOUT="${INSTANCE_START_TIMEOUT:-60}"
+INSTANCE_START_TIMEOUT="${INSTANCE_START_TIMEOUT:-120}"
 VM_ARG=()
 
 # Install lxd-client
diff --git a/pipelines/images/imagebuild.sh b/pipelines/images/imagebuild.sh
index 8731e15..5a26930 100644
--- a/pipelines/images/imagebuild.sh
+++ b/pipelines/images/imagebuild.sh
@@ -49,7 +49,7 @@ if [[ ! "${MISSING_VARS}" == "0" ]] ; then
 fi
 
 # Default optional variables
-INSTANCE_START_TIMEOUT="${INSTANCE_START_TIMEOUT:-60}"
+INSTANCE_START_TIMEOUT="${INSTANCE_START_TIMEOUT:-120}"
 NETWORK_SLEEP="${NETWORK_SLEEP:-15}"
 
 # Dependencies
-- 
2.34.1