launchpad-reviewers team mailing list archive

[Colin Watson <mp+415305@xxxxxxxxxxxxxxxxxx>]

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

Commit message:
Remove powerpc builder infrastructure

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

No builds for powerpc are being dispatched any more, and nobody has objected to its decommissioning.  Let's remove it.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad-mojo-specs/+git/private:vbuilder-remove-powerpc into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index cee0ebd..853c8f3 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -31,14 +31,14 @@
 {%-   set lp_environment = "production" %}
 {%-   set lp_sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEA4S1rlPwy+df0A6TTojZgV0KeXV00RB76Oi0IuGE/LxPhGa7OvFAb/a69NED9ykKRrbRT5UgtosXKa1fPURqk78bg85WdBG0rNbpd7k4aXh3wgPOTmgUPYdgK+4R/yO5osdpa2lnKf50HNpLHujskWiR/0iksEZ/+CRr+1f1a0n8= lp_buildd@cesium" %}
 {%-   set modifiers_bos01 = '{}' %}
-{%-   set modifiers_bos02 = '{"arm64": "10.44.0.22", "powerpc": "10.44.0.21", "ppc64el": "10.44.0.20", "s390x": "10.44.0.18"}' %}
+{%-   set modifiers_bos02 = '{"arm64": "10.44.0.22", "ppc64el": "10.44.0.20", "s390x": "10.44.0.18"}' %}
 {%-   set name_prefix = "launchpad-buildd" %}
 {%-   set openstack_tenant_name = "vbuilder_project" %}
 {%-   set openstack_tenant_name_lcy02 = "launchpad-vbuilder-production_project" %}
 {%-   set openstack_username = "vbuilder" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-production" %}
 {%-   set vbuilders_bos01 = {} %}
-{%-   set vbuilders_bos02 = {"arm64": ("bionic", 80), "powerpc": ("xenial", 8), "ppc64el": ("bionic", 30), "s390x": ("bionic", 20)} %}
+{%-   set vbuilders_bos02 = {"arm64": ("bionic", 80), "ppc64el": ("bionic", 30), "s390x": ("bionic", 20)} %}
 {%-   set vbuilders_lcy01 = {"amd64": ("bionic", 30)} %}
 {%-   set vbuilders_lcy02 = {"amd64": ("bionic", 60)} %}
 {%-   set vbuilders_lgw01 = {"amd64": ("bionic", 60)} %}
@@ -75,15 +75,15 @@
 {%-   set lp_buildd_managers = "91.189.90.132" %}
 {%-   set lp_environment = "dogfood" %}
 {%-   set lp_sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDB3Qw9541hRDiGVLGxZm/afNsCirlM6Wa2/VkdU22KQfVu579+ek8fdgvR/si7UOTDgE4j7DGuJW+pk7z6T08Iy5feaI3JpnZV7PX0Qp8CilrcTNWPL1eBoq5HcYDzl+zyXT341l7GBFhwYQ50sF3hq0RV0XvUwxfheyBtdmzkiVE1LXT7kdFvXtxe0fR9ypw+NuMRqqFyZ9w3tee7zclDw1cCcnDf6vmIXbYLF9yNZOQQhwYQFFgIUepdkUg2onyhYXWKj8mooFVGne0WPVTJ5Sz805soh9SuUGGgpTh70EtgpJ1nxSWGtIWUtNc6mSGdZzGtgVTnbDk04J4FrVX3Bu8yetlQbNPPYuxdqaZP1anoKmgtCIhfe+xCkim5YLc+WZXVRGvk6apCLXMnj9ZhRE7fCKQO/F+aNPCONv0gUVncxuWAyiqdRuilqSA7VTEMYTv7pIYSNOjpD5eMIX2wGkYTjEXopGJouUH2nOXlhsGgssmMepSVJhOJKY1Cfq0ND4ydoDd2Mz1Yj+Us9HToqJU6DD1sAIKOV05fBqVsJEJbctI2vpRY/R1nCBySpM4KpzgkCQWwjkjR8h2/nuwDtyMsJe/BdBuDyRwJGnBLNgBUg+tnWl9yePz/ZXVGrAI7gPuc9DIiuKEvEmiO3o9yfRRjsFMWGIk2y/Hfa01V7w== launchpad@labbu" %}
-{%-   set modifiers_bos01 = '{"arm64": "10.43.0.10", "powerpc": "10.43.0.21", "ppc64el": "10.43.0.23", "s390x": "10.43.0.15"}' %}
-{%-   set modifiers_bos02 = '{"arm64": "10.44.0.13", "powerpc": "10.44.0.16", "ppc64el": "10.44.0.19", "s390x": "10.44.0.14"}' %}
+{%-   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 name_prefix = "launchpad-buildd-staging" %}
 {%-   set openstack_tenant_name = "vbuilder_staging_project" %}
 {%-   set openstack_tenant_name_lcy02 = "launchpad-vbuilder-staging_project" %}
 {%-   set openstack_username = "vbuilder_staging" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
-{%-   set vbuilders_bos01 = {"arm64": ("bionic", 1), "powerpc": ("xenial", 1), "ppc64el": ("bionic", 1), "s390x": ("bionic", 1)} %}
-{%-   set vbuilders_bos02 = {"arm64": ("bionic", 1), "powerpc": ("xenial", 1), "ppc64el": ("bionic", 1), "s390x": ("bionic", 1)} %}
+{%-   set vbuilders_bos01 = {"arm64": ("bionic", 1), "ppc64el": ("bionic", 1), "s390x": ("bionic", 1)} %}
+{%-   set vbuilders_bos02 = {"arm64": ("bionic", 1), "ppc64el": ("bionic", 1), "s390x": ("bionic", 1)} %}
 {%-   set vbuilders_lcy01 = {"amd64": ("bionic", 4)} %}
 {%-   set vbuilders_lcy02 = {"amd64": ("bionic", 4)} %}
 {%-   set vbuilders_lgw01 = {"amd64": ("bionic", 4)} %}
@@ -128,23 +128,6 @@ applications:
       region: scalingstack-bos01
       use_swift: false
       visibility: private
-  glance-simplestreams-sync-bos01-powerpc:
-    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=xenial", "arch~(powerpc)", "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-ppc64el:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -196,22 +179,6 @@ applications:
       region: scalingstack-bos02
       use_swift: false
       visibility: private
-  glance-simplestreams-sync-bos02-powerpc:
-    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=xenial", "arch~(powerpc)", "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-ppc64el:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -303,13 +270,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-powerpc:
-    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
-    options:
-      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      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:
@@ -333,13 +293,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-powerpc:
-    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
-    options:
-      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      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-ppc64el:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -492,12 +445,10 @@ applications:
 relations:
 {%- if stage_name == "staging" %}
   - ["glance-simplestreams-sync-bos01-arm64:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64:image-modifier"]
-  - ["glance-simplestreams-sync-bos01-powerpc:image-modifier", "launchpad-buildd-image-modifier-bos01-powerpc:image-modifier"]
   - ["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"]
 {%- endif %}
   - ["glance-simplestreams-sync-bos02-arm64:image-modifier", "launchpad-buildd-image-modifier-bos02-arm64:image-modifier"]
-  - ["glance-simplestreams-sync-bos02-powerpc:image-modifier", "launchpad-buildd-image-modifier-bos02-powerpc: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"]
   - ["glance-simplestreams-sync-lcy01-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
@@ -513,12 +464,10 @@ relations:
   - ["rabbitmq-server", "ntp"]
 {%- if stage_name == "staging" %}
   - ["glance-simplestreams-sync-bos01-arm64", "ntp"]
-  - ["glance-simplestreams-sync-bos01-powerpc", "ntp"]
   - ["glance-simplestreams-sync-bos01-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos01-s390x", "ntp"]
 {%- endif %}
   - ["glance-simplestreams-sync-bos02-arm64", "ntp"]
-  - ["glance-simplestreams-sync-bos02-powerpc", "ntp"]
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
   - ["glance-simplestreams-sync-lcy01-amd64", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 9766087..a6aa66d 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -13,11 +13,9 @@ name_prefix_by_stage = {
 targets_by_stage = {
     "staging": [
         ("bos01", "arm64", "bionic"),
-        ("bos01", "powerpc", "xenial"),
         ("bos01", "ppc64el", "bionic"),
         ("bos01", "s390x", "bionic"),
         ("bos02", "arm64", "bionic"),
-        ("bos02", "powerpc", "xenial"),
         ("bos02", "ppc64el", "bionic"),
         ("bos02", "s390x", "bionic"),
         ("lcy01", "amd64", "bionic"),
@@ -26,7 +24,6 @@ targets_by_stage = {
         ],
     "production": [
         ("bos02", "arm64", "bionic"),
-        ("bos02", "powerpc", "xenial"),
         ("bos02", "ppc64el", "bionic"),
         ("bos02", "s390x", "bionic"),
         ("lcy01", "amd64", "bionic"),