launchpad-reviewers team mailing list archive

[Colin Watson <mp+426647@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
Add config_drive to vbuilders dictionaries

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

arm64 fails with "unsupported configuration: IDE controllers are unsupported for this QEMU binary or machine type" if we ask it to use a config drive.

This goes together with https://code.launchpad.net/~cjwatson/launchpad-vbuilder-manage/+git/launchpad-vbuilder-manage/+merge/426644.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-config-drive into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index a379bb0..d9d70b8 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -34,9 +34,9 @@
 {%-   set openstack_username = "vbuilder" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
 {%-   set vbuilders_bos01 = {} %}
-{%-   set vbuilders_bos02 = {"arm64": ("focal", 80), "ppc64el": ("focal", 30), "s390x": ("focal", 20)} %}
-{%-   set vbuilders_lcy02 = {"amd64": ("focal", 120)} %}
-{%-   set vbuilders_lgw01 = {"amd64": ("focal", 60)} %}
+{%-   set vbuilders_bos02 = {"arm64": ("focal", 80, false), "ppc64el": ("focal", 30, true), "s390x": ("focal", 20, true)} %}
+{%-   set vbuilders_lcy02 = {"amd64": ("focal", 120, true)} %}
+{%-   set vbuilders_lgw01 = {"amd64": ("focal", 60, true)} %}
 {%-   set vbuilder_prefix = "" %}
 {%- else %}
 {%-   set content_id_template = "launchpad-buildd:staging" %}
@@ -73,10 +73,10 @@
 {%-   set openstack_tenant_name_lcy02 = "launchpad-vbuilder-staging_project" %}
 {%-   set openstack_username = "vbuilder_staging" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
-{%-   set vbuilders_bos01 = {"arm64": ("focal", 1), "ppc64el": ("focal", 1), "s390x": ("focal", 1)} %}
-{%-   set vbuilders_bos02 = {"arm64": ("focal", 1), "ppc64el": ("focal", 1), "s390x": ("focal", 1)} %}
-{%-   set vbuilders_lcy02 = {"amd64": ("focal", 4)} %}
-{%-   set vbuilders_lgw01 = {"amd64": ("focal", 4)} %}
+{%-   set vbuilders_bos01 = {"arm64": ("focal", 1, false), "ppc64el": ("focal", 1, true), "s390x": ("focal", 1, true)} %}
+{%-   set vbuilders_bos02 = {"arm64": ("focal", 1, false), "ppc64el": ("focal", 1, true), "s390x": ("focal", 1, true)} %}
+{%-   set vbuilders_lcy02 = {"amd64": ("focal", 4, true)} %}
+{%-   set vbuilders_lgw01 = {"amd64": ("focal", 4, true)} %}
 {%-   set vbuilder_prefix = "dogfood-" %}
 {%- endif %}
 
@@ -89,8 +89,8 @@
 
 {%- macro vbuilders(region, arches) %}
 {%-   set arch_sep = joiner(", ") -%}
-[{% for arch, (series, count) in arches|dictsort -%}
-{{ arch_sep() }}{"image_name_prefix": "{{ name_prefix }}/ubuntu-{{ series }}-daily-{{ arch }}-", "instance_flavor": "vbuilder", "hostnames": {{ vbuilder_hostnames("%s%s-%s" % (vbuilder_prefix, region, arch), count) }}}
+[{% for arch, (series, count, config_drive) in arches|dictsort -%}
+{{ arch_sep() }}{"image_name_prefix": "{{ name_prefix }}/ubuntu-{{ series }}-daily-{{ arch }}-", "instance_flavor": "vbuilder", "hostnames": {{ vbuilder_hostnames("%s%s-%s" % (vbuilder_prefix, region, arch), count) }}, "config_drive": {{ config_drive|tojson }}}
 {%- endfor %}]
 {%- endmacro -%}