launchpad-reviewers team mailing list archive

[Ines Almeida <mp+475121@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/launchpad-mojo-specs/+git/private:remove-bos01-amd64-gpu-infra into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
Remove infrastructure related to bos01 amd64-gpu builders
    
This removes the units from all environments, including production

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~ines-almeida/launchpad-mojo-specs/+git/private/+merge/475121
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~ines-almeida/launchpad-mojo-specs/+git/private:remove-bos01-amd64-gpu-infra into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 1e241ec..ab1a635 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -47,7 +47,7 @@
 {%-   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}} %}
+{%-   set vbuilders_bos01 = {"arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 2, "config_drive": false}} %}
 {%-   set vbuilders_bos02 = {} %}
 {%-   set vbuilders_bos03 = {"amd64": {"series": "noble", "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": "noble", "count": 120}} %}
@@ -92,7 +92,7 @@
 {%-   set openstack_username = "vbuilder_staging" %}
 {%-   set openstack_username_bos03 = "launchpad-vbuilder-staging" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
-{%-   set vbuilders_bos01 = {"amd64": {"series": "jammy", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "jammy", "count": 1, "config_drive": false}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "jammy", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}, "ppc64el": {"series": "jammy", "count": 1}, "s390x": {"series": "jammy", "count": 1}} %}
+{%-   set vbuilders_bos01 = {"arm64": {"series": "jammy", "count": 1, "config_drive": false}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "jammy", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}, "ppc64el": {"series": "jammy", "count": 1}, "s390x": {"series": "jammy", "count": 1}} %}
 {%-   set vbuilders_bos02 = {"arm64": {"series": "jammy", "count": 1, "config_drive": false}, "ppc64el": {"series": "jammy", "count": 1}, "s390x": {"series": "jammy", "count": 1}} %}
 {%-   set vbuilders_bos03 = {"amd64": {"series": "jammy", "count": 4}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "jammy", "count": 4}} %}
@@ -139,7 +139,7 @@
 {%-   set openstack_username = "vbuilder_staging" %}
 {%-   set openstack_username_bos03 = "launchpad-vbuilder-staging" %}
 {%-   set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
-{%-   set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}} %}
+{%-   set vbuilders_bos01 = {"arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}} %}
 {%-   set vbuilders_bos02 = {} %}
 {%-   set vbuilders_bos03 = {"amd64": {"series": "noble", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "noble", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64"}, "ppc64el": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-ppc64el"}, "riscv64": {"series": "noble", "count": 1, "config_drive": false}, "s390x": {"series": "focal", "count": 3, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "noble", "count": 4}} %}
@@ -166,22 +166,6 @@ applications:
     charm: ch:rabbitmq-server
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
     num_units: 2
-  glance-simplestreams-sync-bos01-amd64:
-    charm: {{ charm_dir }}/glance-simplestreams-sync
-    constraints: "{{ extra_constraints }}"
-    num_units: 1
-    options:
-      content_id_template: "{{ content_id_template }}"
-      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~(x86_64|amd64)", "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-arm64-gpu:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -323,17 +307,6 @@ applications:
       clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
-  launchpad-buildd-image-modifier-bos01-amd64:
-    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
-    options:
-      clamav-database-url: "{{ clamav_database_url }}"
-      extra-keys: "-----BEGIN PGP PUBLIC KEY BLOCK-----\nVersion: GnuPG v2\n\nmI0ESUm55wEEALrxow0PCnGeCAebH9g5+wtZBfXZdx2vZts+XsTTHxDRsMNgMC9b\n0klCgbydvkmF9WCphCjQ61Wp/Bh0C7DSXVCpA/xs55QB5VCUceIMZCbMTPq1h7Ht\ncA1f+o6+OCPUntErG6eGize6kGhdjBNPOT+q4BSIL69rPuwfM9ZyAYcBABEBAAG0\nJkxhdW5jaHBhZCBQUEEgZm9yIExhdW5jaHBhZCBEZXZlbG9wZXJziLYEEwECACAF\nAklJuecCGwMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAAKCRAtH/tsClF0rxsQA/0Q\nw0Yk+xIA1xibyf+UCF9/4fXzdo/tr76qxPRyFiv0uLbFOmW6t26jzpWBHocCHcCU\n57l7rlcEzIHFMcS9Ol6MughP4lhywf9ceeqg2SD6AXjZ0iFarwkueTcHwff5j0lG\nIzzCUVTYJ+m79f/r0dfctL2DwnX7JnT/41mEuR1qbokBHAQQAQIABgUCTB7s7wAK\nCRDFXO8hUqH8T94pCACxl/Gdo82N01H82HvNBa8zQFixNQIwNJN/VxH3WfRvissW\nOMTJnTnNOQErxUhqHrasvZf3djNoHeKRNToTTBaGiEwoySmEK05i4Toq74jWAOs6\nflD2S8natWbobK5V+B2pXZl5g/4Ay21C3H1sZlUxDCcOH9Jh8/0feAZHoSQ/V1Xa\nrEPb+TGdV0hP3Yp7+nIT91sYkj566kA8fjoxJrY/EvXGn98bhYMbMNbtS1Z0WeGp\nzG2hiL6wLSLBxz4Ae9MShOMwNyC1zmr/d1wlF0Efx1N9HaRtRq2s/zqH+ebB7Sr+\nV+SquObb0qr4eAjtslN5BxWROhf+wZM6WJO0Z6nBiQEcBBABAgAGBQJTHvsiAAoJ\nEIngjfAzAr5Z8y4H/jltxz5OwHIDoiXsyWnpjO1SZUV6I6evKpSD7huYtd7MwFZC\n0CgExsPPqLNQCUxITR+9jlqofi/QsTwP7Qq55VmIrKLrZ9KCK1qBnMa/YEXi6TeK\n65lnyN6lNOdzhcsBm3s1/U9ewWp1vsw4UAclmu6tI8GUko+e32K1QjMtIjeVejQl\nJCYDjuxfHhcFWyRo0TWu24F6VD3YxBHpne/M00yd2mLLpHdQrxw/vbvVhZkRDutQ\nemKRA81ZM2WZ1iqYOXtEs5VrD/PtU0nvSAowgeWBmcOwWn3Om+pVsnSoFo46CDvo\nC6YXOWMOMFIxfVhPWqlBkWQsnXFzgk/Xyo4vlTY=\n=Wq6H\n-----END PGP PUBLIC KEY BLOCK-----"
-      extra-packages: "nvidia-headless-535-grid nvidia-utils-535-grid"
-      # extra-sources must also be set in the secrets file, to add
-      # ppa:launchpad/ubuntu/buildd-gpu; that requires an authentication
-      # token.
-      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
   launchpad-buildd-image-modifier-bos01-arm64-gpu:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -504,7 +477,6 @@ applications:
           pattern = "/usr/local/sbin/ppa-reset"
       install_method: snap
 relations:
-  - ["glance-simplestreams-sync-bos01-amd64:image-modifier", "launchpad-buildd-image-modifier-bos01-amd64:image-modifier"]
   - ["glance-simplestreams-sync-bos01-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64-gpu:image-modifier"]
   - ["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"]
@@ -519,7 +491,6 @@ relations:
   - ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
-  - ["glance-simplestreams-sync-bos01-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 92f559d..6e42025 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -13,7 +13,6 @@ name_prefix_by_stage = {
 
 targets_by_stage = {
     "qastaging": [
-        ("bos01", "amd64", "focal"),
         ("bos01", "arm64-gpu", "focal"),
         ("bos03", "amd64", "noble"),
         ("bos03", "amd64-gpu", "focal"),
@@ -24,7 +23,6 @@ targets_by_stage = {
         ("lcy02", "amd64", "noble"),
         ],
     "staging": [
-        ("bos01", "amd64", "jammy"),
         ("bos01", "arm64-gpu", "jammy"),
         ("bos01", "ppc64el", "jammy"),
         ("bos01", "s390x", "jammy"),
@@ -34,7 +32,6 @@ targets_by_stage = {
         ("lcy02", "amd64", "jammy"),
         ],
     "production": [
-        ("bos01", "amd64", "focal"),
         ("bos03", "amd64", "noble"),
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "noble"),
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index c4f7b5a..3f294af 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -8,7 +8,6 @@ import subprocess
 
 targets_by_stage = {
     "qastaging": [
-        ("bos01", "amd64"),
         ("bos01", "arm64-gpu"),
         ("bos03", "amd64"),
         ("bos03", "amd64-gpu"),
@@ -19,7 +18,6 @@ targets_by_stage = {
         ("lcy02", "amd64"),
     ],
     "staging": [
-        ("bos01", "amd64"),
         ("bos01", "arm64-gpu"),
         ("bos01", "ppc64el"),
         ("bos01", "s390x"),
@@ -29,7 +27,6 @@ targets_by_stage = {
         ("lcy02", "amd64"),
     ],
     "production": [
-        ("bos01", "amd64"),
         ("bos03", "amd64"),
         ("bos03", "amd64-gpu"),
         ("bos03", "arm64"),