launchpad-reviewers team mailing list archive

[Tushar Gupta <mp+477427@xxxxxxxxxxxxxxxxxx>]

Tushar Gupta has proposed merging ~tushar5526/launchpad-mojo-specs/+git/private:remove-bos01-units-on-qastaging 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/477427
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~tushar5526/launchpad-mojo-specs/+git/private:remove-bos01-units-on-qastaging into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index f0dd7c2..94af167 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -100,23 +100,19 @@
 {%- elif stage_name == "qastaging" %}
 {%-   set clamav_database_url = "http://clamav-database-mirror.staging.lp.internal/"; %}
 {%-   set content_id_template = "launchpad-buildd:qastaging" %}
-{%-   set dns_update_host_bos01 = "10.189.0.2" %}
 {%-   set dns_update_host_bos02 = "10.189.128.2" %}
 {%-   set dns_update_host_bos03 = "10.189.128.2" %}
 {%-   set dns_update_host_lcy02 = "10.132.31.11 10.132.31.12 10.132.31.13" %}
 {%-   set dns_update_key_name = "vbuilder-staging-manage" %}
-{%-   set domain_bos01 = "vbuilder.qastaging.bos01.scalingstack" %}
 {%-   set domain_bos02 = "vbuilder.qastaging.bos02.scalingstack" %}
 {%-   set domain_bos03 = "vbuilder.qastaging.bos03.scalingstack" %}
 {%-   set domain_lcy02 = "vbuilder.qastaging.lcy02.scalingstack" %}
 {%-   set extra_constraints = "" %}
 {%-   set gss_series = "focal|jammy" %}
 {%-   set gss_series_with_noble = gss_series + "|noble" %}
-{%-   set instance_key_name_bos01 = "ppa-manage-test-qastaging" %}
 {%-   set instance_key_name_bos02 = "ppa-manage-test-qastaging" %}
 {%-   set instance_key_name_bos03 = "ppa-manage-test-qastaging" %}
 {%-   set instance_key_name_lcy02 = "ppa-manage-test-qastaging" %}
-{%-   set instance_network_bos01 = "10.189.36.0/24" %}
 {%-   set instance_network_bos02 = "10.189.164.0/23" %}
 {%-   set instance_network_bos03 = "10.144.4.0/23" %}
 {%-   set instance_network_lcy02 = "10.134.4.0/23" %}
@@ -129,7 +125,6 @@
 {%-   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"}' %}
 {%-   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" %}
@@ -139,7 +134,6 @@
 {%-   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_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,6 +160,7 @@ applications:
     charm: ch:rabbitmq-server
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
     num_units: 2
+{%- if stage_name in ("production") %}
   glance-simplestreams-sync-bos01-arm64-gpu:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -183,6 +178,7 @@ applications:
       region: scalingstack-bos01
       use_swift: false
       visibility: private
+{%- endif %}
   glance-simplestreams-sync-bos03-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -324,6 +320,7 @@ applications:
       clamav-database-url: "{{ clamav_database_url }}"
       launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
       linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+{%- if stage_name in ("production") %}
   launchpad-buildd-image-modifier-bos01-arm64-gpu:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -334,6 +331,7 @@ 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
+{% endif %}
   launchpad-buildd-image-modifier-bos03-amd64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -402,6 +400,7 @@ applications:
       remote-modifiers: '{{ modifiers_bos03 }}'
       remote-modifier-private-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder
       remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
+{%- if stage_name in ("production") %}
   vbuilder-manage-bos01:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
@@ -426,6 +425,7 @@ applications:
       openstack-tenant-name: "{{ openstack_tenant_name }}"
       openstack-username: "{{ openstack_username }}"
       vbuilders: '{{ vbuilders("bos01", vbuilders_bos01) }}'
+{% endif %}
   vbuilder-manage-bos03:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=4 mem=8G root-disk=50G {{ extra_constraints }}"
@@ -499,7 +499,9 @@ applications:
           pattern = "/usr/local/sbin/ppa-reset"
       install_method: snap
 relations:
+{%- if stage_name in ("production") %}
   - ["glance-simplestreams-sync-bos01-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64-gpu: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"]
   - ["glance-simplestreams-sync-bos03-arm64:image-modifier", "launchpad-buildd-image-modifier-bos03-arm64:image-modifier"]
@@ -510,11 +512,15 @@ relations:
   - ["glance-simplestreams-sync-bos03-s390x:image-modifier", "launchpad-buildd-image-modifier-bos03-s390x:image-modifier"]
   - ["glance-simplestreams-sync-bos03-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos03-ppc64el:image-modifier"]
   - ["glance-simplestreams-sync-lcy02-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
+{%- if stage_name in ("production") %}
   - ["vbuilder-manage-bos01:amqp", "rabbitmq-server:amqp"]
+{% endif %}
   - ["vbuilder-manage-bos03:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
   - ["rabbitmq-server", "ntp"]
+{%- if stage_name in ("production") %}
   - ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
+{% endif %}
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
   - ["glance-simplestreams-sync-bos03-arm64", "ntp"]
@@ -525,7 +531,9 @@ relations:
   - ["glance-simplestreams-sync-bos03-s390x", "ntp"]
   - ["glance-simplestreams-sync-bos03-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-lcy02-amd64", "ntp"]
+{%- if stage_name in ("production") %}
   - ["vbuilder-manage-bos01", "ntp"]
+{%- endif %}
   - ["vbuilder-manage-bos03", "ntp"]
   - ["vbuilder-manage-lcy02", "ntp"]
   - ["clamav-database-mirror", "ntp"]