launchpad-reviewers team mailing list archive

[Colin Watson <mp+415911@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-production-build-focal into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Build both bionic and focal images for production

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/415911
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-production-build-focal into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 6ab0f1c..f137489 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -12,7 +12,7 @@
 {%-   set domain_lcy02 = "vbuilder.lcy02.scalingstack" %}
 {%-   set domain_lgw01 = "vbuilder.lgw01.scalingstack" %}
 {%-   set extra_constraints = "root-disk-source=volume" %}
-{%-   set gss_series = "bionic" %}
+{%-   set gss_series = "bionic|focal" %}
 {%-   set instance_key_name_bos01 = "vbuilder-manage-bos01" %}
 {%-   set instance_key_name_bos02 = "vbuilder-manage-bos02" %}
 {%-   set instance_key_name_lcy01 = "vbuilder-manage-lcy01" %}
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index a4425be..36643a9 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -23,12 +23,12 @@ targets_by_stage = {
         ("lgw01", "amd64", "focal"),
         ],
     "production": [
-        ("bos02", "arm64", "bionic"),
-        ("bos02", "ppc64el", "bionic"),
-        ("bos02", "s390x", "bionic"),
-        ("lcy01", "amd64", "bionic"),
-        ("lcy02", "amd64", "bionic"),
-        ("lgw01", "amd64", "bionic"),
+        ("bos02", "arm64", "focal"),
+        ("bos02", "ppc64el", "focal"),
+        ("bos02", "s390x", "focal"),
+        ("lcy01", "amd64", "focal"),
+        ("lcy02", "amd64", "focal"),
+        ("lgw01", "amd64", "focal"),
         ],
     }