launchpad-reviewers team mailing list archive

[Colin Watson <mp+453131@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
vbuilder: Add bos03-riscv64 on qastaging

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

This is up and running on qastaging, and is good enough to get a builder VM up.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-qastaging-riscv64 into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index d588d9d..c3b40ce 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -110,12 +110,15 @@
 {%-   set instance_router = "vbuilder_staging_router" %}
 {%-   set instance_router_bos03 = "router_launchpad-vbuilder-staging" %}
 {%-   set instance_router_lcy02 = "router_launchpad-vbuilder-staging" %}
+{#-   Output of "openstack image show -c id -f value qemu-riscv64-uboot". #}
+{%-   set kernel_id_bos03_riscv64 = "bcbb013b-9424-4f61-9fda-6374d29d3ee0" %}
 {%-   set launchpad_buildd_repository = "ppa:launchpad/buildd-staging" %}
 {%-   set lp_buildd_managers = "10.132.54.242" %}
 {%-   set lp_environment = "qastaging" %}
 {%-   set lp_sshkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFrjt0yytzrK9fQuG+6VgE6QStUbDmunlN7+Lv5XhmoL stg-launchpad@launchpad-bastion-ps5" %}
 {%-   set modifiers_bos01 = '{"arm64": "10.43.0.10", "ppc64el": "10.43.0.23", "s390x": "10.43.0.15"}' %}
 {%-   set modifiers_bos02 = '{"arm64": "10.44.0.13", "ppc64el": "10.44.0.19", "s390x": "10.44.0.14"}' %}
+{%-   set modifiers_bos03 = '{"riscv64": "10.144.0.114"}' %}
 {%-   set name_prefix = "launchpad-buildd-qastaging" %}
 {%-   set openstack_tenant_name = "vbuilder_staging_project" %}
 {%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-staging_project" %}
@@ -125,7 +128,7 @@
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
 {%-   set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "focal", "count": 1, "config_drive": false}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}, "ppc64el": {"series": "focal", "count": 1}, "s390x": {"series": "focal", "count": 1}} %}
 {%-   set vbuilders_bos02 = {"arm64": {"series": "focal", "count": 1, "config_drive": false}, "ppc64el": {"series": "focal", "count": 1}, "s390x": {"series": "focal", "count": 1}} %}
-{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 4}} %}
+{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 4}, "riscv64": {"series": "jammy", "count": 1, "config_drive": false}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "focal", "count": 4}} %}
 {%-   set vbuilder_prefix = "qastaging-" %}
 {%- endif %}
@@ -298,6 +301,25 @@ applications:
       region: scalingstack-bos03
       use_swift: false
       visibility: private
+{%- if stage_name == "qastaging" %}
+  glance-simplestreams-sync-bos03-riscv64:
+    charm: {{ charm_dir }}/glance-simplestreams-sync
+    constraints: "{{ extra_constraints }}"
+    num_units: 1
+    options:
+      content_id_template: "{{ content_id_template }}"
+      custom_properties: "hw_emulation_architecture=riscv64 hw_machine_type=virt kernel_id={{ kernel_id_bos03_riscv64 }}"
+      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~(riscv64)", "ftype~(disk1.img|disk.img)"]}]
+      name_prefix: "{{ name_prefix }}/"
+      openstack-auth-url: "https://keystone.ps6.canonical.com:5000/v3";
+      openstack-identity-api-version: "3"
+      openstack-tenant-name: "{{ openstack_tenant_name_bos03 }}"
+      openstack-username: "{{ openstack_username_bos03 }}"
+      region: scalingstack-bos03
+      use_swift: false
+      visibility: private
+{%- endif %}
   glance-simplestreams-sync-lcy02-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -401,6 +423,20 @@ applications:
       clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+{%- if stage_name == "qastaging" %}
+  launchpad-buildd-image-modifier-bos03-riscv64:
+    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
+    options:
+      clamav-database-url: "{{ clamav_database_url }}"
+      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+      # jammy defaults to 5.0/stable, which has some race conditions
+      # affecting Launchpad builds.
+      lxd-channel: "5.15/stable"
+      remote-modifiers: '{{ modifiers_bos03 }}'
+      remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
+      remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
+{%- endif %}
   vbuilder-manage-bos01:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
@@ -530,6 +566,9 @@ relations:
   - ["glance-simplestreams-sync-bos02-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos02-ppc64el:image-modifier"]
   - ["glance-simplestreams-sync-bos02-s390x:image-modifier", "launchpad-buildd-image-modifier-bos02-s390x:image-modifier"]
   - ["glance-simplestreams-sync-bos03-amd64:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64:image-modifier"]
+{%- if stage_name == "qastaging" %}
+  - ["glance-simplestreams-sync-bos03-riscv64:image-modifier", "launchpad-buildd-image-modifier-bos03-riscv64:image-modifier"]
+{%- endif %}
   - ["glance-simplestreams-sync-lcy02-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
   - ["vbuilder-manage-bos01:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-bos02:amqp", "rabbitmq-server:amqp"]
@@ -545,6 +584,9 @@ relations:
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
+{%- if stage_name == "qastaging" %}
+  - ["glance-simplestreams-sync-bos03-riscv64", "ntp"]
+{%- endif %}
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
   - ["vbuilder-manage-bos01", "ntp"]
   - ["vbuilder-manage-bos02", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 0f66c7f..88f6d5d 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -22,6 +22,7 @@ targets_by_stage = {
         ("bos02", "ppc64el", "focal"),
         ("bos02", "s390x", "focal"),
         ("bos03", "amd64", "focal"),
+        ("bos03", "riscv64", "jammy"),
         ("lcy02", "amd64", "focal"),
         ],
     "staging": [
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 6f7f70d..3a0174e 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -17,6 +17,7 @@ targets_by_stage = {
         ("bos02", "ppc64el"),
         ("bos02", "s390x"),
         ("bos03", "amd64"),
+        ("bos03", "riscv64"),
         ("lcy02", "amd64"),
     ],
     "staging": [