launchpad-reviewers team mailing list archive

[Colin Watson <mp+453216@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
vbuilder: Add bos03-riscv64 on production

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad-mojo-specs/+git/private/+merge/453216
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-production-riscv64 into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index c3b40ce..c601076 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -23,12 +23,15 @@
 {%-   set instance_router = "vbuilder_router" %}
 {%-   set instance_router_bos03 = "router_launchpad-vbuilder-production" %}
 {%-   set instance_router_lcy02 = "router_launchpad-vbuilder-production" %}
+{#-   Output of "openstack image show -c id -f value qemu-riscv64-uboot". #}
+{%-   set kernel_id_bos03_riscv64 = "c5015509-91c3-4684-80cc-b8a2ef44c8b5" %}
 {%-   set launchpad_buildd_repository = "ppa:launchpad/buildd" %}
 {%-   set lp_buildd_managers = "10.131.66.156 10.131.215.202" %}
 {%-   set lp_environment = "production" %}
 {%-   set lp_sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD3tBvyEaZFX8H4krfXGhczq9q/GCfcE0kpsjK8WzM/lQOhWQAVSmm8O9gposKvu4mT28hBWI746+NOPLBrf9ax7YRoU+ZuZesyIIK6ztN07G4aK2vt+1W9yNZKgTJZ8FvxHwlbFy6wMjMP3OzuxWyh0yi03z1YiGPJt0riJRZT+QecaoyYhkTuRbcCoWbhmM0veUjCvfR7LA43YbOfmts7STNCtl1IUJErmUY6fSR1LkyF9uJSdwozAVht242vI8Yg+PrOnKCx3X5w546okP2uMDVXKWeY2g/MhUSr+ZyIaS2JxUygZ7FKS4gNLYb3O4Q6tcIwPE++zsr9HueTfjw2LyeQTZQDQjuv0kJ40B3IFF4E9FMzu8MDwArOKUGzISLrX5VtDZBKINDclfDbrFWHUlVBC2CIIjGPKj3afluP9jadWjsOQx0ooBO0tb0Se+7t3oNjKlknwD85AYCPzIlZt7wo/+e/V/Tilw+UUf00JioEceTdxuOHmbuxP5RzCleg8pYLfe5jiHfBJi0DhO61IYlFMgSToh78EShHWYEdSbD+Ve5GWKvPEU9CsSTleSSqBFdhyggfB5fHiup0efAqMnstDn5sxGYFzfFu7SNVHkMuFeiRHZK+9fF/nfzk0UK5EaGs+4IMhWS1ns8m5O5Li609c/nXK5t5fBOkiWa+RQ== lp_buildd@juju-4112d9-prod-launchpad-manual-servers-4" %}
 {%-   set modifiers_bos01 = '{"arm64": "10.43.0.29", "ppc64el": "10.43.0.36", "s390x": "10.43.0.39"}' %}
 {%-   set modifiers_bos02 = '{"arm64": "10.44.0.22", "ppc64el": "10.44.0.20", "s390x": "10.44.0.18"}' %}
+{%-   set modifiers_bos03 = '{"riscv64": "10.143.254.223"}' %}
 {%-   set name_prefix = "launchpad-buildd" %}
 {%-   set openstack_tenant_name = "vbuilder_project" %}
 {%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-production_project" %}
@@ -38,7 +41,7 @@
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
 {%-   set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 5}, "arm64": {"series": "focal", "count": 40, "config_drive": false}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 2, "config_drive": false}, "ppc64el": {"series": "focal", "count": 20}, "s390x": {"series": "focal", "count": 20}} %}
 {%-   set vbuilders_bos02 = {"arm64": {"series": "focal", "count": 80, "config_drive": false}, "ppc64el": {"series": "focal", "count": 30}, "s390x": {"series": "focal", "count": 20}} %}
-{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 60}} %}
+{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 60}, "riscv64": {"series": "jammy", "count": 60, "config_drive": false}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "focal", "count": 120}} %}
 {%-   set vbuilder_prefix = "" %}
 {%- elif stage_name == "staging" %}
@@ -301,7 +304,7 @@ applications:
       region: scalingstack-bos03
       use_swift: false
       visibility: private
-{%- if stage_name == "qastaging" %}
+{%- if stage_name in ("production", "qastaging") %}
   glance-simplestreams-sync-bos03-riscv64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -423,7 +426,7 @@ 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" %}
+{%- if stage_name in ("production", "qastaging") %}
   launchpad-buildd-image-modifier-bos03-riscv64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -566,7 +569,7 @@ 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" %}
+{%- if stage_name in ("production", "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"]
@@ -584,7 +587,7 @@ relations:
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
-{%- if stage_name == "qastaging" %}
+{%- if stage_name in ("production", "qastaging") %}
   - ["glance-simplestreams-sync-bos03-riscv64", "ntp"]
 {%- endif %}
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 88f6d5d..5979c46 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -46,6 +46,7 @@ targets_by_stage = {
         ("bos02", "ppc64el", "focal"),
         ("bos02", "s390x", "focal"),
         ("bos03", "amd64", "focal"),
+        ("bos03", "riscv64", "jammy"),
         ("lcy02", "amd64", "focal"),
         ],
     }
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 3a0174e..bd46c6a 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -41,6 +41,7 @@ targets_by_stage = {
         ("bos02", "ppc64el"),
         ("bos02", "s390x"),
         ("bos03", "amd64"),
+        ("bos03", "riscv64"),
         ("lcy02", "amd64"),
     ],
 }