launchpad-reviewers team mailing list archive

[Tushar Gupta <mp+486199@xxxxxxxxxxxxxxxxxx>]

Tushar Gupta has proposed merging ~tushar5526/launchpad-mojo-specs/+git/private:add-buildd-extras-to-riscv-image-build-process into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~tushar5526/launchpad-mojo-specs/+git/private/+merge/486199
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~tushar5526/launchpad-mojo-specs/+git/private:add-buildd-extras-to-riscv-image-build-process into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 19eb047..0b459af 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -104,6 +104,7 @@
 {%-   set extra_constraints = "" %}
 {%-   set gss_series = "focal|jammy" %}
 {%-   set gss_series_with_noble = gss_series + "|noble" %}
+{%-   set gss_series_only_noble = "noble" %}
 {%-   set instance_key_name_bos02 = "ppa-manage-test-qastaging" %}
 {%-   set instance_key_name_bos03 = "ppa-manage-test-qastaging" %}
 {%-   set instance_key_name_lcy02 = "ppa-manage-test-qastaging" %}
@@ -228,8 +229,13 @@ applications:
     options:
       content_id_template: "{{ content_id_template }}"
       custom_properties: "hw_emulation_architecture=riscv64 hw_machine_type=virt hw_video_model=virtio kernel_id={{ kernel_id_bos03_riscv64 }}"
+{%- if stage_name in ("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_only_noble }})", "arch~(riscv64)", "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_with_noble }})", "arch~(riscv64)", "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"
@@ -345,6 +351,10 @@ applications:
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
       sbuild-stalled-package-timeout: 1500
+{%- if stage_name in ("qastaging") %}
+      extra-sources: "deb https://ppa.launchpadcontent.net/launchpad/buildd-extras/ubuntu $SERIES main"
+      extra-keys: "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2\n\nmI0ESUm55wEEALrxow0PCnGeCAebH9g5+wtZBfXZdx2vZts+XsTTHxDRsMNgMC9b\n0klCgbydvkmF9WCphCjQ61Wp/Bh0C7DSXVCpA/xs55QB5VCUceIMZCbMTPq1h7Ht\ncA1f+o6+OCPUntErG6eGize6kGhdjBNPOT+q4BSIL69rPuwfM9ZyAYcBABEBAAG0\nJkxhdW5jaHBhZCBQUEEgZm9yIExhdW5jaHBhZCBEZXZlbG9wZXJziLYEEwECACAF\nAklJuecCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAtH/tsClF0rxsQA/0Q\nw0Yk+xIA1xibyf+UCF9/4fXzdo/tr76qxPRyFiv0uLbFOmW6t26jzpWBHocCHcCU\n57l7rlcEzIHFMcS9Ol6MughP4lhywf9ceeqg2SD6AXjZ0iFarwkueTcHwff5j0lG\nIzzCUVTYJ+m79f/r0dfctL2DwnX7JnT/41mEuR1qbokBHAQQAQIABgUCTB7s7wAK\nCRDFXO8hUqH8T94pCACxl/Gdo82N01H82HvNBa8zQFixNQIwNJN/VxH3WfRvissW\nOMTJnTnNOQErxUhqHrasvZf3djNoHeKRNToTTBaGiEwoySmEK05i4Toq74jWAOs6\nflD2S8natWbobK5V+B2pXZl5g/4Ay21C3H1sZlUxDCcOH9Jh8/0feAZHoSQ/V1Xa\nrEPb+TGdV0hP3Yp7+nIT91sYkj566kA8fjoxJrY/EvXGn98bhYMbMNbtS1Z0WeGp\nzG2hiL6wLSLBxz4Ae9MShOMwNyC1zmr/d1wlF0Efx1N9HaRtRq2s/zqH+ebB7Sr+\nV+SquObb0qr4eAjtslN5BxWROhf+wZM6WJO0Z6nBiQEcBBABAgAGBQJTHvsiAAoJ\nEIngjfAzAr5Z8y4H/jltxz5OwHIDoiXsyWnpjO1SZUV6I6evKpSD7huYtd7MwFZC\n0CgExsPPqLNQCUxITR+9jlqofi/QsTwP7Qq55VmIrKLrZ9KCK1qBnMa/YEXi6TeK\n65lnyN6lNOdzhcsBm3s1/U9ewWp1vsw4UAclmu6tI8GUko+e32K1QjMtIjeVejQl\nJCYDjuxfHhcFWyRo0TWu24F6VD3YxBHpne/M00yd2mLLpHdQrxw/vbvVhZkRDutQ\nemKRA81ZM2WZ1iqYOXtEs5VrD/PtU0nvSAowgeWBmcOwWn3Om+pVsnSoFo46CDvo\nC6YXOWMOMFIxfVhPWqlBkWQsnXFzgk/Xyo4vlTY=\n=Wq6H\n-----END PGP PUBLIC KEY BLOCK-----"
+{%- endif %}
 {%- endif %}
   launchpad-buildd-image-modifier-bos03-s390x:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier