launchpad-reviewers team mailing list archive

[Guruprasad <mp+473847@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad-mojo-specs/+git/private:remove-bos01-bos02-s390x-applications into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Remove all configuration for bos01, bos02 s390x builders

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/private/+merge/473847
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad-mojo-specs/+git/private:remove-bos01-bos02-s390x-applications into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 230f593..947ff4f 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -47,8 +47,8 @@
 {%-   set openstack_username = "vbuilder" %}
 {%-   set openstack_username_bos03 = "launchpad-vbuilder-production" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
-{%-   set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 5}, "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 = {"ppc64el": {"series": "focal", "count": 30}, "s390x": {"series": "focal", "count": 20}} %}
+{%-   set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 5}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 2, "config_drive": false}, "ppc64el": {"series": "focal", "count": 20}} %}
+{%-   set vbuilders_bos02 = {"ppc64el": {"series": "focal", "count": 30}} %}
 {%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 60}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 18}, "arm64": {"series": "noble", "count": 120, "config_drive": false, "flavor": "vbuilder-arm64"}, "ppc64el": {"series": "focal", "count": 50, "config_drive": false, "flavor": "vbuilder-ppc64el"}, "riscv64": {"series": "jammy", "count": 60, "config_drive": false}, "s390x": {"series": "focal", "count": 40, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "focal", "count": 120}} %}
 {%-   set vbuilder_prefix = "" %}
@@ -217,23 +217,6 @@ applications:
       region: scalingstack-bos01
       use_swift: false
       visibility: private
-  glance-simplestreams-sync-bos01-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.infra.bos01.scalingstack:5000/v3";
-      openstack-identity-api-version: "3"
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      region: scalingstack-bos01
-      use_swift: false
-      visibility: private
   glance-simplestreams-sync-bos02-ppc64el:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -250,22 +233,6 @@ applications:
       region: scalingstack-bos02
       use_swift: false
       visibility: private
-  glance-simplestreams-sync-bos02-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.infra.bos02.scalingstack:5000/v2.0";
-      openstack-tenant-name: "{{ openstack_tenant_name }}"
-      openstack-username: "{{ openstack_username }}"
-      region: scalingstack-bos02
-      use_swift: false
-      visibility: private
 {%- endif %}
   glance-simplestreams-sync-bos03-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
@@ -422,15 +389,6 @@ applications:
       remote-modifiers: '{{ modifiers_bos01 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
-  launchpad-buildd-image-modifier-bos01-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_bos01 }}'
-      remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
-      remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
   launchpad-buildd-image-modifier-bos02-ppc64el:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -440,15 +398,6 @@ applications:
       remote-modifiers: '{{ modifiers_bos02 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
-  launchpad-buildd-image-modifier-bos02-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_bos02 }}'
-      remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
-      remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
 {%- endif %}
   launchpad-buildd-image-modifier-bos03-amd64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
@@ -637,9 +586,7 @@ relations:
   - ["glance-simplestreams-sync-bos01-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64-gpu:image-modifier"]
 {%- if stage_name == "production" %}
   - ["glance-simplestreams-sync-bos01-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos01-ppc64el:image-modifier"]
-  - ["glance-simplestreams-sync-bos01-s390x:image-modifier", "launchpad-buildd-image-modifier-bos01-s390x:image-modifier"]
   - ["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"]
 {%- endif %}
   - ["glance-simplestreams-sync-bos03-amd64:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64:image-modifier"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64-gpu:image-modifier"]
@@ -659,9 +606,7 @@ relations:
   - ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
 {%- if stage_name == "production" %}
   - ["glance-simplestreams-sync-bos01-ppc64el", "ntp"]
-  - ["glance-simplestreams-sync-bos01-s390x", "ntp"]
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
-  - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
 {%- endif %}
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index da33d87..701701a 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -36,9 +36,7 @@ targets_by_stage = {
     "production": [
         ("bos01", "amd64", "focal"),
         ("bos01", "ppc64el", "focal"),
-        ("bos01", "s390x", "focal"),
         ("bos02", "ppc64el", "focal"),
-        ("bos02", "s390x", "focal"),
         ("bos03", "amd64", "focal"),
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "noble"),
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 7ef1f45..7f062af 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -31,9 +31,7 @@ targets_by_stage = {
     "production": [
         ("bos01", "amd64"),
         ("bos01", "ppc64el"),
-        ("bos01", "s390x"),
         ("bos02", "ppc64el"),
-        ("bos02", "s390x"),
         ("bos03", "amd64"),
         ("bos03", "amd64-gpu"),
         ("bos03", "arm64"),