launchpad-reviewers team mailing list archive

[Guruprasad <mp+473090@xxxxxxxxxxxxxxxxxx>]

Guruprasad has proposed merging ~lgp171188/launchpad-mojo-specs/+git/private:add-bos03-ppc64el-builders-production into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: Add bos03 ppc64el builders in production

This is needed for us to migrate the ppc64el builders from bos01, bos02
to bos03.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/private/+merge/473090
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad-mojo-specs/+git/private:add-bos03-ppc64el-builders-production into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 01bf2a6..04e46ee 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -39,7 +39,7 @@
 #}
 {%-   set modifiers_bos01 = '{"arm64": "10.43.0.29", "ppc64el": "10.43.0.36", "s390x": "10.43.0.39"}' %}
 {%-   set modifiers_bos02 = '{"arm64": "10.44.0.22", "ppc64el": "10.44.0.20", "s390x": "10.44.0.18"}' %}
-{%-   set modifiers_bos03 = '{"arm64": "10.143.254.129", "riscv64": "10.143.254.223", "s390x": "10.143.254.18"}' %}
+{%-   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" %}
 {%-   set openstack_tenant_name = "vbuilder_project" %}
 {%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-production_project" %}
@@ -49,7 +49,7 @@
 {%-   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}, "ppc64el": {"series": "focal", "count": 20}, "s390x": {"series": "focal", "count": 20}} %}
 {%-   set vbuilders_bos02 = {"ppc64el": {"series": "focal", "count": 30}, "s390x": {"series": "focal", "count": 20}} %}
-{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 60}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 18}, "arm64": {"series": "focal", "count": 120, "config_drive": false, "flavor": "vbuilder-arm64"}, "riscv64": {"series": "jammy", "count": 60, "config_drive": false}, "s390x": {"series": "focal", "count": 40, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
+{%-   set vbuilders_bos03 = {"amd64": {"series": "focal", "count": 60}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 18}, "arm64": {"series": "focal", "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": "focal", "count": 120}} %}
 {%-   set vbuilder_prefix = "" %}
 {%- elif stage_name == "staging" %}
@@ -352,7 +352,6 @@ applications:
       region: scalingstack-bos03
       use_swift: false
       visibility: private
-{%- if stage_name == "qastaging" %}
   glance-simplestreams-sync-bos03-ppc64el:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -370,7 +369,6 @@ applications:
       region: scalingstack-bos03
       use_swift: false
       visibility: private
-{%- endif %}
   glance-simplestreams-sync-lcy02-amd64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -506,7 +504,6 @@ 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 == "qastaging" %}
   launchpad-buildd-image-modifier-bos03-ppc64el:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -516,7 +513,6 @@ 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
-{%- endif %}
   vbuilder-manage-bos01:
     charm: {{ charm_dir }}/vbuilder-manage
     constraints: "cores=2 mem=8G root-disk=20G {{ extra_constraints }}"
@@ -652,9 +648,7 @@ relations:
   - ["glance-simplestreams-sync-bos03-riscv64:image-modifier", "launchpad-buildd-image-modifier-bos03-riscv64:image-modifier"]
 {%- endif %}
   - ["glance-simplestreams-sync-bos03-s390x:image-modifier", "launchpad-buildd-image-modifier-bos03-s390x:image-modifier"]
-{%- if stage_name == "qastaging" %}
   - ["glance-simplestreams-sync-bos03-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos03-ppc64el:image-modifier"]
-{%- endif %}
   - ["glance-simplestreams-sync-lcy02-amd64:image-modifier", "launchpad-buildd-image-modifier-amd64:image-modifier"]
   - ["vbuilder-manage-bos01:amqp", "rabbitmq-server:amqp"]
   - ["vbuilder-manage-bos02:amqp", "rabbitmq-server:amqp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index cffdd1c..7747cc5 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -42,6 +42,7 @@ targets_by_stage = {
         ("bos03", "amd64", "focal"),
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "focal"),
+        ("bos03", "ppc64el", "focal"),
         ("bos03", "riscv64", "jammy"),
         ("bos03", "s390x", "focal"),
         ("lcy02", "amd64", "focal"),
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 657fff9..7ef1f45 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -37,6 +37,7 @@ targets_by_stage = {
         ("bos03", "amd64"),
         ("bos03", "amd64-gpu"),
         ("bos03", "arm64"),
+        ("bos03", "ppc64el"),
         ("bos03", "riscv64"),
         ("bos03", "s390x"),
         ("lcy02", "amd64"),