launchpad-reviewers team mailing list archive

[Tushar Gupta <mp+476757@xxxxxxxxxxxxxxxxxx>]

Tushar Gupta has proposed merging ~tushar5526/launchpad-mojo-specs/+git/private:remove-bos01-arm64-gpu-builders-and-gss-lbim-untis into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~tushar5526/launchpad-mojo-specs/+git/private/+merge/476757
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~tushar5526/launchpad-mojo-specs/+git/private:remove-bos01-arm64-gpu-builders-and-gss-lbim-untis into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index f0dd7c2..a8ba61d 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -37,7 +37,7 @@
   The image modifiers run on amd64 by default, so the `modifiers_XXX` variables
   will only be relevant for the remaining archs.
 #}
-{%-   set modifiers_bos01 = '{"arm64": "10.43.0.29", "ppc64el": "10.43.0.36"}' %}
+{%-   set modifiers_bos01 = '{"ppc64el": "10.43.0.36"}' %}
 {%-   set modifiers_bos02 = '{"arm64": "10.44.0.22", "ppc64el": "10.44.0.20"}' %}
 {%-   set modifiers_bos03 = '{"arm64": "10.143.254.129", "ppc64el": "10.143.254.194", "riscv64": "10.143.254.223", "s390x": "10.143.254.18"}' %}
 {%-   set name_prefix = "launchpad-buildd" %}
@@ -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 = {"arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 2, "config_drive": false}} %}
+{%-   set vbuilders_bos01 = {} %}
 {%-   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": 12}, "arm64": {"series": "noble", "count": 120, "config_drive": false, "flavor": "vbuilder-arm64"}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-arm64-gpu", "count": 3}, "ppc64el": {"series": "focal", "count": 50, "config_drive": false, "flavor": "vbuilder-ppc64el"}, "riscv64": {"series": "noble", "count": 60, "config_drive": false}, "s390x": {"series": "focal", "count": 40, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
 {%-   set vbuilders_lcy02 = {"amd64": {"series": "noble", "count": 120}} %}
@@ -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 = {"arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}} %}
+{%-   set vbuilders_bos01 = {} %}
 {%-   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"}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-arm64-gpu", "count": 1}, "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,23 +166,6 @@ applications:
     charm: ch:rabbitmq-server
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
     num_units: 2
-  glance-simplestreams-sync-bos01-arm64-gpu:
-    charm: {{ charm_dir }}/glance-simplestreams-sync
-    constraints: "{{ extra_constraints }}"
-    num_units: 1
-    options:
-      content_id_template: "{{ content_id_template }}:gpu"
-      custom_properties: 'hypervisor_type=kvm hw_firmware_type=uefi'
-      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~(arm64|aarch64)", "ftype~(disk1.img|disk.img)"]}]
-      name_prefix: "{{ name_prefix }}-gpu/"
-      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-bos03-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -324,16 +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-arm64-gpu:
-    charm: {{ charm_dir }}/launchpad-buildd-image-modifier
-    options:
-      clamav-database-url: "{{ clamav_database_url }}"
-      extra-packages: "nvidia-headless-525-server nvidia-utils-525-server"
-      launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
-      linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false compat_uts_machine=armv7l"
-      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-bos03-amd64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -499,7 +472,6 @@ applications:
           pattern = "/usr/local/sbin/ppa-reset"
       install_method: snap
 relations:
-  - ["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"]
   - ["glance-simplestreams-sync-bos03-arm64:image-modifier", "launchpad-buildd-image-modifier-bos03-arm64:image-modifier"]
@@ -514,7 +486,6 @@ relations:
   - ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
-  - ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
   - ["glance-simplestreams-sync-bos03-arm64", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index e389efd..cf9f734 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -13,7 +13,6 @@ name_prefix_by_stage = {
 
 targets_by_stage = {
     "qastaging": [
-        ("bos01", "arm64-gpu", "focal"),
         ("bos03", "amd64", "noble"),
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "noble"),
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 8a0879c..5621ca6 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -8,7 +8,6 @@ import subprocess
 
 targets_by_stage = {
     "qastaging": [
-        ("bos01", "arm64-gpu"),
         ("bos03", "amd64"),
         ("bos03", "amd64-gpu"),
         ("bos03", "arm64"),