launchpad-reviewers team mailing list archive

[Tushar Gupta <mp+486309@xxxxxxxxxxxxxxxxxx>]

Tushar Gupta has proposed merging ~tushar5526/launchpad-mojo-specs/+git/private:add-buildd-extras-during-image-build-for-riscv64-for-prod into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Requested reviews:
  Alvaro Crespo Serrano (alvarocs)
  Guruprasad (lgp171188)

For more details, see:
https://code.launchpad.net/~tushar5526/launchpad-mojo-specs/+git/private/+merge/486309
-- 
Your team Launchpad code reviewers is subscribed to branch ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index f313616..2cf0ea5 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -229,13 +229,8 @@ 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"
@@ -351,11 +346,9 @@ 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-----\nComment: Hostname: \nVersion: Hockeypuck 2.2\n\nxsFNBGYo1hkBEACz8s9l5i53v/8Pp+P1pDxR/Ak6Z4l5HlgPhLWFrCFA4K/fjxw9\nHfmIeb4LAVvBcPQS6UnmDDYyyZ+yfJJMN7XVs6rg8nXI6Uzsy+xKjpTwxOY292Jq\nQ2vOH98uhSYpGN2SIY746O22oMqrVxqEGcaAIs7TvmHg1NuxBMcAQTrBn6fNRwf6\nBwSCbWBAYXaYwbw4fgqBIgeXu/SSwBtLLzBN2pI9OxrIwWYdr+oHdsBqo/hf3f2e\nhL+og4AnGkOAtOYmwSeJTNlRXdCmPS0LSS1jtpZfC6Gw1JIlDNZHmgwNRcS+N5fP\nWIAB5NtZd6hCm9hE+KFK+Mbe3EwbcYroCa5YpHpoDbkhNBMVOltZJ/JxBejKZL6R\nk32AVuhCewBpzcmWbdq5+UwVuRvwm47b1hfg+Oun7Z8USCgX1guM1avhAV1Mwgqy\nOLfxEYOHjJNNCxkON7bmnDTvckGe3xC24kO/b8IoRz/hOuGtZqvv1v+QHwo6qt2e\nccdOOF7xl4UWAz7U3+lrkbBxEb53K8umEIgGXQJf7VgZzJVhxxgYpdanKX4o0Ar7\n/aA9xJkH6iLXLLolbPx3gpla8qQZFEMGnCjtLso+yliUUAPFt3n9eF/MEC68ns//\n/1v60tWJS8yOOpZGeOFFGXW4W7aGaa1rN7bOqecGmbZXWYy8Ps1z7aNapQARAQAB\nzTFMYXVuY2hwYWQgUFBBIGZvciBDYW5vbmljYWwgTGF1bmNocGFkIEVuZ2luZWVy\naW5nwsGOBBMBCgA4FiEEQRAZncEzRqbH/6/EiZ4dOwxcdUwFAmYo1hkCGwMFCwkI\nBwIGFQoJCAsCBBYCAwECHgECF4AACgkQiZ4dOwxcdUwCTw/9GID+ntqKgqz9rE12\nms8+DYlt6kSabrgsUPdRYGHfxQ64ma72CUvQF2cImZ5DfAzb10YkMI/d7hgfFtV0\nYEHAbdQYqg3hl41V98qr1PCQiPlukeTyvo8GQ1osi0taNWU3WuPBEBtggLRjvh4p\n8xbUEmQjr+tFGVV8W6kj935dZCLKzobktN1q/6KXo4zZXLBNM9A6x2fu+YLjuqd9\ncE+2Kd/n/CGwQ4dpEJWvxgin1/kQfZkGmgDnpwX0sOGCst14ZtBySMt8BPZh6z91\nfQw7Ur0DjheTCzLH2Ey5AVGGW1Ljcy9aSFYloFv2H22DJmQ7xdp5LvPDI1JQAiYY\nQTqEY3PXes7ZXnTVbImLTA2mBdhcNnm/RI/ghjYf9wiu+W8dko5uh9Yt8gvO9rNj\nDebKe7rPkOnmFit54fNDFtKD18FQyyZhWm5ovlR4qqsgLx3VdPB0jkpbWqUPoy4b\nMlKUb1zFewCw9WBFXfPA/mN7+vJOsob433BF2fkjysPn/65f+1NXANESRALKqa+u\n2Rh9kJ7kw3JEIt9iWM5qIykYRRZGpVaAQ53ocYydoBl2pxF+Tn5iH/1Lw9aEkOZT\nDEKSDmiQWBnM2AzFWtXE+7ASGsQaL/mv2ycjP2S7pdMhQSte5cgONqiqvuHVXzh1\nKTnnnBXLPEfy3mof5QD2PpsvyCk=\n=AnL4\n-----END PGP PUBLIC KEY BLOCK-----"
 {%- endif %}
-{%- endif %}
   launchpad-buildd-image-modifier-bos03-s390x:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options: