launchpad-reviewers team mailing list archive

[Ines Almeida <mp+475807@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/launchpad-mojo-specs/+git/private:vbuilder-add-arm64-gpu-builders-to-bos03-production into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder with ~ines-almeida/launchpad-mojo-specs/+git/private:vbuilder-add-arm64-gpu-builders-to-bos03 as a prerequisite.

Commit message:
vbuilder: Add arm64-gpu to bos03 production

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 1a5a346..1b6ab41 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -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}} %}
 {%-   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"}, "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_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": 1}, "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}} %}
 {%-   set vbuilder_prefix = "" %}
 {%- elif stage_name == "staging" %}
@@ -248,7 +248,6 @@ applications:
       region: scalingstack-bos03
       use_swift: false
       visibility: private
-{%- if stage_name == "qastaging" %}
   glance-simplestreams-sync-bos03-arm64-gpu:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -266,7 +265,6 @@ applications:
       region: scalingstack-bos03
       use_swift: false
       visibility: private
-{%- endif %}
 {%- if stage_name in ("production", "qastaging") %}
   glance-simplestreams-sync-bos03-riscv64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
@@ -391,7 +389,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-arm64-gpu:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -402,7 +399,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 %}
 {%- if stage_name in ("production", "qastaging") %}
   launchpad-buildd-image-modifier-bos03-riscv64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
@@ -535,9 +531,7 @@ relations:
   - ["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"]
-{%- if stage_name == "qastaging" %}
   - ["glance-simplestreams-sync-bos03-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos03-arm64-gpu:image-modifier"]
-{%- endif %}
 {%- if stage_name in ("production", "qastaging") %}
   - ["glance-simplestreams-sync-bos03-riscv64:image-modifier", "launchpad-buildd-image-modifier-bos03-riscv64:image-modifier"]
 {%- endif %}
@@ -553,9 +547,7 @@ relations:
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64-gpu", "ntp"]
   - ["glance-simplestreams-sync-bos03-arm64", "ntp"]
-{%- if stage_name == "qastaging" %}
   - ["glance-simplestreams-sync-bos03-arm64-gpu", "ntp"]
-{%- endif %}
 {%- if stage_name in ("production", "qastaging") %}
   - ["glance-simplestreams-sync-bos03-riscv64", "ntp"]
 {%- endif %}
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 10e91d7..486a9e8 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -39,6 +39,7 @@ targets_by_stage = {
         ("bos03", "amd64", "noble"),
         ("bos03", "amd64-gpu", "focal"),
         ("bos03", "arm64", "noble"),
+        ("bos03", "arm64-gpu", "focal"),
         ("bos03", "ppc64el", "focal"),
         ("bos03", "riscv64", "noble"),
         ("bos03", "s390x", "focal"),
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index ea4c955..a4f8ecc 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -34,6 +34,7 @@ targets_by_stage = {
         ("bos03", "amd64"),
         ("bos03", "amd64-gpu"),
         ("bos03", "arm64"),
+        ("bos03", "arm64-gpu"),
         ("bos03", "ppc64el"),
         ("bos03", "riscv64"),
         ("bos03", "s390x"),