← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~lgp171188/launchpad-mojo-specs/+git/private:upgrade-amd64-builders-to-noble-qastaging into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder

 

Guruprasad has proposed merging ~lgp171188/launchpad-mojo-specs/+git/private:upgrade-amd64-builders-to-noble-qastaging into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Upgrade qastaging amd64 non-GPU builders to noble

This is in preparation for doing a similar upgrade in production to
unblock the Ubuntu oracular release.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/private/+merge/473920
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad-mojo-specs/+git/private:upgrade-amd64-builders-to-noble-qastaging into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 230f593..4f5f572 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -141,8 +141,8 @@
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
 {%-   set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}} %}
 {%-   set vbuilders_bos02 = {} %}
-{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "noble", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64"}, "ppc64el": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-ppc64el"}, "riscv64": {"series": "noble", "count": 1, "config_drive": false}, "s390x": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
-{%-   set vbuilders_lcy02 = {"amd64": {"series": "focal", "count": 4}} %}
+{%-   set vbuilders_bos03 = {"amd64": {"series": "noble", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "noble", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64"}, "ppc64el": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-ppc64el"}, "riscv64": {"series": "noble", "count": 1, "config_drive": false}, "s390x": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
+{%-   set vbuilders_lcy02 = {"amd64": {"series": "noble", "count": 4}} %}
 {%-   set vbuilder_prefix = "qastaging-" %}
 {%- endif %}
 
@@ -273,8 +273,12 @@ applications:
     num_units: 1
     options:
       content_id_template: "{{ content_id_template }}"
+      {%- if stage_name == "qastaging" %}
       mirror_list: |-
+        [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 3, item_filters: ["release~({{ gss_series_with_noble }})", "arch~(x86_64|amd64)", "ftype~(disk1.img|disk.img)"]}]
+      {%- else %}
         [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 3, item_filters: ["release~({{ gss_series }})", "arch~(x86_64|amd64)", "ftype~(disk1.img|disk.img)"]}]
+      {%- endif %}
       name_prefix: "{{ name_prefix }}/"
       openstack-auth-url: "https://keystone.ps6.canonical.com:5000/v3";
       openstack-identity-api-version: "3"
@@ -375,8 +379,13 @@ applications:
     num_units: 1
     options:
       content_id_template: "{{ content_id_template }}"
+      {%- if stage_name == "qastaging" %}
+      mirror_list: |-
+        [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 3, item_filters: ["release~({{ gss_series_with_noble }})", "arch~(x86_64|amd64)", "ftype~(disk1.img|disk.img)"]}]
+      {%- else %}
       mirror_list: |-
         [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 3, item_filters: ["release~({{ gss_series }})", "arch~(x86_64|amd64)", "ftype~(disk1.img|disk.img)"]}]
+      {%- endif %}
       name_prefix: "{{ name_prefix }}/"
       openstack-auth-url: "https://keystone.ps5.canonical.com:5000/v3";
       openstack-identity-api-version: "3"
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index da33d87..a967913 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -15,13 +15,13 @@ targets_by_stage = {
     "qastaging": [
         ("bos01", "amd64", "focal"),
         ("bos01", "arm64-gpu", "focal"),
-        ("bos03", "amd64", "focal"),
+        ("bos03", "amd64", "noble"),
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "noble"),
         ("bos03", "ppc64el", "focal"),
         ("bos03", "riscv64", "noble"),
         ("bos03", "s390x", "focal"),
-        ("lcy02", "amd64", "focal"),
+        ("lcy02", "amd64", "noble"),
         ],
     "staging": [
         ("bos01", "amd64", "jammy"),

Follow ups