jjb: Add job for building Ubuntu images

Change-Id: I3b59a30b461ab170073234cd0d7737e27c755875
Signed-off-by: Kienan Stewart <kstewart@efficios.com>

diff --git a/jobs/images.yml b/jobs/images.yml
index 56fafb3a84c962d19758306ea3feb48154b03e92..04c91e71f029d2c2d8ac20be9439d5f700751ff4 100644 (file)
--- 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 5dceb73b9012df34572a219434aa4ec62a360026..fea1d13655e2057a54f533c2eb984315e03d0032 100644 (file)
--- 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 8731e1517c6669ecd4d04712a988029fd7c3d8f8..5a2693027d09f27c6aab02b8d3bae87d90a729ce 100644 (file)
--- 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