launchpad-reviewers team mailing list archive

[Colin Watson <mp+447434@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-use-jammy into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Switch builders to use jammy images

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/447434

We should have all these images available on production now.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-use-jammy into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 54c4f36..ac7516b 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -40,11 +40,11 @@
 {%-   set openstack_username = "vbuilder" %}
 {%-   set openstack_username_bos03 = "launchpad-vbuilder-production" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
-{%-   set vbuilders_bos01 = {"amd64": ("focal", "vbuilder-gpu", 5, true), "arm64": ("focal", "vbuilder", 40, false), "ppc64el": ("focal", "vbuilder", 20, true), "s390x": ("focal", "vbuilder", 20, true)} %}
-{%-   set vbuilders_bos02 = {"arm64": ("focal", "vbuilder", 80, false), "ppc64el": ("focal", "vbuilder", 30, true), "s390x": ("focal", "vbuilder", 20, true)} %}
-{%-   set vbuilders_bos03 = {"amd64": ("focal", "vbuilder", 60, true)} %}
-{%-   set vbuilders_lcy02 = {"amd64": ("focal", "vbuilder", 120, true)} %}
-{%-   set vbuilders_lgw01 = {"amd64": ("focal", "vbuilder", 60, true)} %}
+{%-   set vbuilders_bos01 = {"amd64": ("jammy", "vbuilder-gpu", 5, true), "arm64": ("jammy", "vbuilder", 40, false), "ppc64el": ("jammy", "vbuilder", 20, true), "s390x": ("jammy", "vbuilder", 20, true)} %}
+{%-   set vbuilders_bos02 = {"arm64": ("jammy", "vbuilder", 80, false), "ppc64el": ("jammy", "vbuilder", 30, true), "s390x": ("jammy", "vbuilder", 20, true)} %}
+{%-   set vbuilders_bos03 = {"amd64": ("jammy", "vbuilder", 60, true)} %}
+{%-   set vbuilders_lcy02 = {"amd64": ("jammy", "vbuilder", 120, true)} %}
+{%-   set vbuilders_lgw01 = {"amd64": ("jammy", "vbuilder", 60, true)} %}
 {%-   set vbuilder_prefix = "" %}
 {%- else %}
 {%-   set clamav_database_url = "http://clamav-database-mirror.staging.lp.internal/"; %}
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index e3ec10c..3511d55 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -24,16 +24,16 @@ targets_by_stage = {
         ("lgw01", "amd64", "jammy"),
         ],
     "production": [
-        ("bos01", "amd64", "focal"),
-        ("bos01", "arm64", "focal"),
-        ("bos01", "ppc64el", "focal"),
-        ("bos01", "s390x", "focal"),
-        ("bos02", "arm64", "focal"),
-        ("bos02", "ppc64el", "focal"),
-        ("bos02", "s390x", "focal"),
-        ("bos03", "amd64", "focal"),
-        ("lcy02", "amd64", "focal"),
-        ("lgw01", "amd64", "focal"),
+        ("bos01", "amd64", "jammy"),
+        ("bos01", "arm64", "jammy"),
+        ("bos01", "ppc64el", "jammy"),
+        ("bos01", "s390x", "jammy"),
+        ("bos02", "arm64", "jammy"),
+        ("bos02", "ppc64el", "jammy"),
+        ("bos02", "s390x", "jammy"),
+        ("bos03", "amd64", "jammy"),
+        ("lcy02", "amd64", "jammy"),
+        ("lgw01", "amd64", "jammy"),
         ],
     }