[cirrus] Update to use image_family

Related: #3856
Signed-off-by: Arif Ali <[email protected]>

.cirrus.yml

@@ -8,6 +8,7 @@ env:
 
     DEBIAN_NAME: "debian-11"
 
+    UBUNTU_DEVEL_NAME: "ubuntu-25.04"
     UBUNTU_LATEST_NAME: "ubuntu-24.10"
     UBUNTU_NAME: "ubuntu-24.04"
     UBUNTU_PRIOR_NAME: "ubuntu-22.04"
@@ -23,17 +24,17 @@ env:
     UBUNTU_DEVEL_PROJECT: "ubuntu-os-cloud-devel"
 
     # Images exist on GCP already
-    CENTOS_9_IMAGE_NAME: "centos-stream-9-v20240415"
-    DEBIAN_IMAGE_NAME: "debian-11-bullseye-v20230809"
-    FEDORA_IMAGE_NAME: "fedora-cloud-base-gcp-38-1-6-x86-64"
-    FEDORA_PRIOR_IMAGE_NAME: "fedora-cloud-base-gcp-37-1-7-x86-64"
+    CENTOS_9_FAMILY_NAME: "centos-stream-9"
+    DEBIAN_FAMILY_NAME: "debian-11"
+    FEDORA_FAMILY_NAME: "fedora-cloud-38"
+    FEDORA_PRIOR_FAMILY_NAME: "fedora-cloud-37"
 
-    UBUNTU_DEB_IMAGE_NAME: "ubuntu-minimal-2410-oracular-amd64-v20241021"
-    UBUNTU_LATEST_IMAGE_NAME: "ubuntu-2410-oracular-amd64-v20241021"
-    UBUNTU_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20241004"
-    UBUNTU_PRIOR_IMAGE_NAME: "ubuntu-2204-jammy-v20240927"
-    UBUNTU_PRIOR2_IMAGE_NAME: "ubuntu-2004-focal-v20241016"
-    UBUNTU_SNAP_IMAGE_NAME: "ubuntu-2404-noble-amd64-v20241004"
+    UBUNTU_DEB_FAMILY_NAME: "ubuntu-minimal-2410-amd64"
+    UBUNTU_LATEST_FAMILY_NAME: "ubuntu-2410-amd64"
+    UBUNTU_FAMILY_NAME: "ubuntu-2404-lts-amd64"
+    UBUNTU_PRIOR_FAMILY_NAME: "ubuntu-2204-lts"
+    UBUNTU_PRIOR2_FAMILY_NAME: "ubuntu-2004-lts"
+    UBUNTU_SNAP_FAMILY_NAME: "ubuntu-2404-lts-amd64"
     UBUNTU_DEVEL_FAMILY_NAME: "ubuntu-2504-amd64"
 
     # Curl-command prefix for downloading task artifacts, simply add the
@@ -98,21 +99,21 @@ rpm_build_task:
     name: "rpm Build From Checkout - ${BUILD_NAME}"
     gce_instance: &standardvm
         image_project: "${PROJECT}"
-        image_name: "${VM_IMAGE_NAME}"
+        image_family: "${VM_FAMILY_NAME}"
         type: e2-medium
     matrix:
         - env: &centos9
             PROJECT: ${CENTOS_PROJECT}
             BUILD_NAME: ${CENTOS_9_NAME}
-            VM_IMAGE_NAME: ${CENTOS_9_IMAGE_NAME}
+            VM_FAMILY_NAME: ${CENTOS_9_FAMILY_NAME}
         - env: &fedora
             PROJECT: ${FEDORA_PROJECT}
             BUILD_NAME: ${FEDORA_NAME}
-            VM_IMAGE_NAME: ${FEDORA_IMAGE_NAME}
+            VM_FAMILY_NAME: ${FEDORA_FAMILY_NAME}
         - env: &fedoraprior
             PROJECT: ${FEDORA_PROJECT}
             BUILD_NAME: ${FEDORA_PRIOR_NAME}
-            VM_IMAGE_NAME: ${FEDORA_PRIOR_IMAGE_NAME}
+            VM_FAMILY_NAME: ${FEDORA_PRIOR_FAMILY_NAME}
     setup_script: |
         dnf clean all
         dnf -y install rpm-build rpmdevtools gettext python3-devel
@@ -137,7 +138,7 @@ deb_build_task:
     name: "deb Build From Checkout"
     gce_instance:
         image_project: "${UBUNTU_PROJECT}"
-        image_name: "${UBUNTU_DEB_IMAGE_NAME}"
+        image_family: "${UBUNTU_DEB_FAMILY_NAME}"
         type: e2-medium
     setup_script: |
         apt update --allow-releaseinfo-change
@@ -159,7 +160,7 @@ snap_build_task:
     name: "snap Build From Checkout"
     gce_instance:
         image_project: "${UBUNTU_PROJECT}"
-        image_name: "${UBUNTU_SNAP_IMAGE_NAME}"
+        image_family: "${UBUNTU_SNAP_FAMILY_NAME}"
         type: e2-medium
     setup_script: |
         apt update
@@ -195,27 +196,27 @@ report_stageone_task:
             PKG: "snap"
             PROJECT: ${UBUNTU_PROJECT}
             BUILD_NAME: "${UBUNTU_NAME} - ${PKG}"
-            VM_IMAGE_NAME: ${UBUNTU_IMAGE_NAME}
+            VM_FAMILY_NAME: ${UBUNTU_FAMILY_NAME}
         - env: &ubuntuprior
             PKG: "snap"
             PROJECT: ${UBUNTU_PROJECT}
             BUILD_NAME: "${UBUNTU_PRIOR_NAME} - ${PKG}"
-            VM_IMAGE_NAME: ${UBUNTU_PRIOR_IMAGE_NAME}
+            VM_FAMILY_NAME: ${UBUNTU_PRIOR_FAMILY_NAME}
         - env: &ubuntuprior2
             PKG: "snap"
             PROJECT: ${UBUNTU_PROJECT}
             BUILD_NAME: "${UBUNTU_PRIOR2_NAME} - ${PKG}"
-            VM_IMAGE_NAME: ${UBUNTU_PRIOR2_IMAGE_NAME}
+            VM_FAMILY_NAME: ${UBUNTU_PRIOR2_FAMILY_NAME}
         - env: &ubuntu-latest-snap
             PKG: "snap"
             PROJECT: ${UBUNTU_PROJECT}
             BUILD_NAME: "${UBUNTU_LATEST_NAME} - ${PKG}"
-            VM_IMAGE_NAME: ${UBUNTU_LATEST_IMAGE_NAME}
+            VM_FAMILY_NAME: ${UBUNTU_LATEST_FAMILY_NAME}
         - env: &ubuntu-latest-deb
             PKG: "deb"
             PROJECT: ${UBUNTU_PROJECT}
             BUILD_NAME: "${UBUNTU_LATEST_NAME} - ${PKG}"
-            VM_IMAGE_NAME: ${UBUNTU_LATEST_IMAGE_NAME}
+            VM_FAMILY_NAME: ${UBUNTU_LATEST_FAMILY_NAME}
     setup_script: &setup |
         if [ $(command -v apt) ]; then
             apt -y purge sosreport
@@ -258,16 +259,16 @@ report_stageone_task:
 report_stageone_daily_task:
     skip: *man-changes-include
     alias: "stageone_daily_report"
-    name: "Report Stage One - ${UBUNTU_DEVEL_FAMILY_NAME}"
+    name: "Report Stage One - $BUILD_NAME"
     allow_failures: true
     depends_on:
         - snap_build
-    gce_instance:
-        image_project: ${UBUNTU_DEVEL_PROJECT}
-        image_family: ${UBUNTU_DEVEL_FAMILY_NAME}
-        type: e2-medium
-    environment:
+    gce_instance: *standardvm
+    environment: &ubuntudevel
       PKG: "snap"
+      PROJECT: ${UBUNTU_DEVEL_PROJECT}
+      VM_FAMILY_NAME: ${UBUNTU_DEVEL_FAMILY_NAME}
+      BUILD_NAME: "${UBUNTU_DEVEL_NAME} - ${PKG}"
     setup_script: *setup
     unittest_script: *unit_test
     main_script: *stageone_test
@@ -306,16 +307,12 @@ report_stagetwo_task:
 report_stagetwo_daily_task:
     skip: *man-changes-include
     alias: "stagetwo_daily_report"
-    name: "Report Stage Two - ${UBUNTU_DEVEL_FAMILY_NAME}"
+    name: "Report Stage Two - $BUILD_NAME"
     allow_failures: true
     depends_on: stageone_daily_report
     timeout_in: 45m
-    gce_instance:
-        image_project: ${UBUNTU_DEVEL_PROJECT}
-        image_family: ${UBUNTU_DEVEL_FAMILY_NAME}
-        type: e2-medium
-    environment:
-      PKG: "snap"
+    gce_instance: *standardvm
+    environment: *ubuntudevel
     setup_script: *setup
     main_script: *stagetwo_test
     on_failure:
@@ -334,7 +331,7 @@ report_foreman_task:
     matrix:
         - env:
             PROJECT: ${DEBIAN_PROJECT}
-            VM_IMAGE_NAME: ${DEBIAN_IMAGE_NAME}
+            VM_FAMILY_NAME: ${DEBIAN_FAMILY_NAME}
             BUILD_NAME: ${DEBIAN_NAME}
             FOREMAN_VER: "3.7"
     setup_script: *setup