launchpad-reviewers team mailing list archive

[Guruprasad <mp+472777@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
vbuilder: remove bos01, bos02 ppc64el, s390x builders in qastaging

These have been replaced by new builders in bos03 as a part of the
migration to bos03.


Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index ab29b40..f225e4c 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -127,8 +127,8 @@
 {%-   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_bos01 = '{"arm64": "10.43.0.10"}' %}
+{%-   set modifiers_bos02 = '{"arm64": "10.44.0.13"}' %}
 {%-   set modifiers_bos03 = '{"amd64": "10.144.0.206", "arm64": "10.144.0.127", "ppc64el": "10.144.0.110", "riscv64": "10.144.0.114", "s390x": "10.144.0.47"}' %}
 {%-   set name_prefix = "launchpad-buildd-qastaging" %}
 {%-   set openstack_tenant_name = "vbuilder_staging_project" %}
@@ -197,72 +197,6 @@ applications:
       region: scalingstack-bos01
       use_swift: false
       visibility: private
-  glance-simplestreams-sync-bos01-ppc64el:
-    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: 2, item_filters: ["release~({{ gss_series }})", "arch~(ppc64el)", "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-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 }}"
-    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: 2, item_filters: ["release~({{ gss_series }})", "arch~(ppc64el)", "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
-  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
   glance-simplestreams-sync-bos03-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -410,42 +344,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-ppc64el:
-    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-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:
-      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
-  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
   launchpad-buildd-image-modifier-bos03-amd64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index f1dd2b5..5175da5 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -15,10 +15,6 @@ targets_by_stage = {
     "qastaging": [
         ("bos01", "amd64", "focal"),
         ("bos01", "arm64-gpu", "focal"),
-        ("bos01", "ppc64el", "focal"),
-        ("bos01", "s390x", "focal"),
-        ("bos02", "ppc64el", "focal"),
-        ("bos02", "s390x", "focal"),
         ("bos03", "amd64", "focal"),
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "focal"),
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 85d42db..0210a14 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -10,10 +10,6 @@ targets_by_stage = {
     "qastaging": [
         ("bos01", "amd64"),
         ("bos01", "arm64-gpu"),
-        ("bos01", "ppc64el"),
-        ("bos01", "s390x"),
-        ("bos02", "ppc64el"),
-        ("bos02", "s390x"),
         ("bos03", "amd64"),
         ("bos03", "amd64-gpu"),
         ("bos03", "arm64"),