launchpad-reviewers team mailing list archive

[Guruprasad <mp+471743@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad-mojo-specs/+git/private:add-vbuilders-bos03-s390x into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: add s390x arch to bos03 region in qastaging

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/private/+merge/471743
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad-mojo-specs/+git/private:add-vbuilders-bos03-s390x into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 87c5d1a..a05c15e 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -126,7 +126,7 @@
 {%-   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 = '{"amd64": "10.144.0.206", "arm64": "10.144.0.127", "riscv64": "10.144.0.114"}' %}
+{%-   set modifiers_bos03 = '{"amd64": "10.144.0.206", "arm64": "10.144.0.127", "riscv64": "10.144.0.114", "s390x": "10.144.0.47"}' %}
 {%-   set name_prefix = "launchpad-buildd-qastaging" %}
 {%-   set openstack_tenant_name = "vbuilder_staging_project" %}
 {%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-staging_project" %}
@@ -136,7 +136,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}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "focal", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64"}, "riscv64": {"series": "noble", "count": 1, "config_drive": false}} %}
+{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "focal", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64"}, "riscv64": {"series": "noble", "count": 1, "config_drive": false}, "s390x": {"series": "focal", "count": 1, "config_drive": false}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "focal", "count": 4}} %}
 {%-   set vbuilder_prefix = "qastaging-" %}
 {%- endif %}
@@ -361,6 +361,25 @@ applications:
       use_swift: false
       visibility: private
 {%- endif %}
+{%- if stage_name == "qastaging" %}
+  glance-simplestreams-sync-bos03-s390x:
+    charm: {{ charm_dir }}/glance-simplestreams-sync
+    constraints: "{{ extra_constraints }}"
+    num_units: 1
+    options:
+      content_id_template: "{{ content_id_template }}"
+      custom_properties: "hypervisor_type=kvm"
+      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~(s390x)", "ftype~(disk1.img|disk.img)"]}]
+      name_prefix: "{{ name_prefix }}/"
+      openstack-auth-url: "http://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 }}"
@@ -503,6 +522,17 @@ applications:
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
       sbuild-stalled-package-timeout: 1500
 {%- endif %}
+{%- if stage_name == "qastaging" %}
+  launchpad-buildd-image-modifier-bos03-s390x:
+    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"
+      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 }}"
@@ -637,6 +667,9 @@ relations:
 {%- if stage_name in ("production", "qastaging") %}
   - ["glance-simplestreams-sync-bos03-riscv64:image-modifier", "launchpad-buildd-image-modifier-bos03-riscv64:image-modifier"]
 {%- endif %}
+{%- if stage_name == "qastaging" %}
+  - ["glance-simplestreams-sync-bos03-s390x:image-modifier", "launchpad-buildd-image-modifier-bos03-s390x: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"]
@@ -657,6 +690,9 @@ relations:
 {%- if stage_name in ("production", "qastaging") %}
   - ["glance-simplestreams-sync-bos03-riscv64", "ntp"]
 {%- endif %}
+{%- if stage_name == "qastaging" %}
+  - ["glance-simplestreams-sync-bos03-s390x", "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 9020499..84a68b1 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -25,6 +25,7 @@ targets_by_stage = {
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "focal"),
         ("bos03", "riscv64", "noble"),
+        ("bos03", "s390x", "focal"),
         ("lcy02", "amd64", "focal"),
         ],
     "staging": [
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 6e48d11..6fc6a6a 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -20,6 +20,7 @@ targets_by_stage = {
         ("bos03", "amd64-gpu"),
         ("bos03", "arm64"),
         ("bos03", "riscv64"),
+        ("bos03", "s390x"),
         ("lcy02", "amd64"),
     ],
     "staging": [