launchpad-reviewers team mailing list archive

[Guruprasad <mp+484950@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
Revert upgrading qastaging GPU builders to noble

We do not need this any more as we applied a different workaround for the
LXD GPU builder issue in production and the image modification for the
GPU builders on noble is broken.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/private/+merge/484950
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad-mojo-specs/+git/private:revert-qastaging-gpu-builders-upgrade-to-noble into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index ce4faec..19eb047 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -129,7 +129,7 @@
 {%-   set openstack_username_bos03 = "launchpad-vbuilder-staging" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
 {%-   set vbuilders_bos02 = {} %}
-{%-   set vbuilders_bos03 = {"amd64": {"series": "noble", "flavor": "vbuilder-large", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "noble", "flavor": "vbuilder-gpu-large", "count": 1}, "arm64": {"series": "noble", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64-large"}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "noble", "flavor": "vbuilder-arm64-gpu-large", "count": 1}, "ppc64el": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-ppc64el-large"}, "riscv64": {"series": "noble", "flavor": "vbuilder-large", "count": 1, "config_drive": false}, "s390x": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-s390x-large"}} %}
+{%-   set vbuilders_bos03 = {"amd64": {"series": "noble", "flavor": "vbuilder-large", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu-large", "count": 1}, "arm64": {"series": "noble", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64-large"}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-arm64-gpu-large", "count": 1}, "ppc64el": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-ppc64el-large"}, "riscv64": {"series": "noble", "flavor": "vbuilder-large", "count": 1, "config_drive": false}, "s390x": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-s390x-large"}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "noble", "count": 4}} %}
 {%-   set vbuilder_prefix = "qastaging-" %}
 {%- endif %}
@@ -177,11 +177,7 @@ applications:
     options:
       content_id_template: "{{ content_id_template }}:gpu"
       mirror_list: |-
-{%- if stage_name == "qastaging" %}
-        [{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 }}-gpu/"
       openstack-auth-url: "https://keystone.ps6.canonical.com:5000/v3";
       openstack-identity-api-version: "3"
@@ -215,11 +211,7 @@ applications:
       content_id_template: "{{ content_id_template }}:gpu"
       custom_properties: "hypervisor_type=kvm hw_firmware_type=uefi"
       mirror_list: |-
-{%- if stage_name == "qastaging" %}
-        [{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~(arm64|aarch64)", "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~(arm64|aarch64)", "ftype~(disk1.img|disk.img)"]}]
-{%- endif %}
       name_prefix: "{{ name_prefix }}-gpu/"
       openstack-auth-url: "https://keystone.ps6.canonical.com:5000/v3";
       openstack-identity-api-version: "3"
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 8a86aff..894b656 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -14,9 +14,9 @@ name_prefix_by_stage = {
 targets_by_stage = {
     "qastaging": [
         ("bos03", "amd64", "", "noble"),
-        ("bos03", "amd64", "-gpu", "noble"),
+        ("bos03", "amd64", "-gpu", "focal"),
         ("bos03", "arm64", "", "noble"),
-        ("bos03", "arm64", "-gpu", "noble"),
+        ("bos03", "arm64", "-gpu", "focal"),
         ("bos03", "ppc64el", "", "focal"),
         ("bos03", "riscv64", "", "noble"),
         ("bos03", "s390x", "", "focal"),