launchpad-reviewers team mailing list archive

[Ines Almeida <mp+455499@xxxxxxxxxxxxxxxxxx>]

Ines Almeida has proposed merging ~ines-almeida/launchpad-mojo-specs/+git/private:add-bos03-arm64-arch into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.

Commit message:
vbuilder: add spec for arm64 bos03 builder in production

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

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

diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index fb4e1cc..6d9d582 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -31,7 +31,7 @@
 {%-   set lp_sshkey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD3tBvyEaZFX8H4krfXGhczq9q/GCfcE0kpsjK8WzM/lQOhWQAVSmm8O9gposKvu4mT28hBWI746+NOPLBrf9ax7YRoU+ZuZesyIIK6ztN07G4aK2vt+1W9yNZKgTJZ8FvxHwlbFy6wMjMP3OzuxWyh0yi03z1YiGPJt0riJRZT+QecaoyYhkTuRbcCoWbhmM0veUjCvfR7LA43YbOfmts7STNCtl1IUJErmUY6fSR1LkyF9uJSdwozAVht242vI8Yg+PrOnKCx3X5w546okP2uMDVXKWeY2g/MhUSr+ZyIaS2JxUygZ7FKS4gNLYb3O4Q6tcIwPE++zsr9HueTfjw2LyeQTZQDQjuv0kJ40B3IFF4E9FMzu8MDwArOKUGzISLrX5VtDZBKINDclfDbrFWHUlVBC2CIIjGPKj3afluP9jadWjsOQx0ooBO0tb0Se+7t3oNjKlknwD85AYCPzIlZt7wo/+e/V/Tilw+UUf00JioEceTdxuOHmbuxP5RzCleg8pYLfe5jiHfBJi0DhO61IYlFMgSToh78EShHWYEdSbD+Ve5GWKvPEU9CsSTleSSqBFdhyggfB5fHiup0efAqMnstDn5sxGYFzfFu7SNVHkMuFeiRHZK+9fF/nfzk0UK5EaGs+4IMhWS1ns8m5O5Li609c/nXK5t5fBOkiWa+RQ== lp_buildd@juju-4112d9-prod-launchpad-manual-servers-4" %}
 {%-   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 = '{"riscv64": "10.143.254.223"}' %}
+{%-   set modifiers_bos03 = '{"arm64": "10.143.254.129", "riscv64": "10.143.254.223"}' %}
 {%-   set name_prefix = "launchpad-buildd" %}
 {%-   set openstack_tenant_name = "vbuilder_project" %}
 {%-   set openstack_tenant_name_bos03 = "launchpad-vbuilder-production_project" %}
@@ -304,7 +304,6 @@ applications:
       region: scalingstack-bos03
       use_swift: false
       visibility: private
-{%- if stage_name == "qastaging" %}
   glance-simplestreams-sync-bos03-arm64:
     charm: {{ charm_dir }}/glance-simplestreams-sync
     constraints: "{{ extra_constraints }}"
@@ -322,7 +321,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
@@ -445,7 +443,6 @@ 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 == "qastaging" %}
   launchpad-buildd-image-modifier-bos03-arm64:
     charm: {{ charm_dir }}/launchpad-buildd-image-modifier
     options:
@@ -455,7 +452,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
@@ -599,9 +595,7 @@ relations:
   - ["glance-simplestreams-sync-bos02-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos02-ppc64el:image-modifier"]
   - ["glance-simplestreams-sync-bos02-s390x:image-modifier", "launchpad-buildd-image-modifier-bos02-s390x:image-modifier"]
   - ["glance-simplestreams-sync-bos03-amd64:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64:image-modifier"]
-{%- if stage_name == "qastaging" %}
   - ["glance-simplestreams-sync-bos03-arm64:image-modifier", "launchpad-buildd-image-modifier-bos03-arm64: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 %}
@@ -620,9 +614,7 @@ relations:
   - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
   - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
   - ["glance-simplestreams-sync-bos03-amd64", "ntp"]
-{%- if stage_name == "qastaging" %}
   - ["glance-simplestreams-sync-bos03-arm64", "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 23539a4..b4f8348 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -47,6 +47,7 @@ targets_by_stage = {
         ("bos02", "ppc64el", "focal"),
         ("bos02", "s390x", "focal"),
         ("bos03", "amd64", "focal"),
+        ("bos03", "arm64", "focal"),
         ("bos03", "riscv64", "jammy"),
         ("lcy02", "amd64", "focal"),
         ],
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index e00b2bc..dcf96c6 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -42,6 +42,7 @@ targets_by_stage = {
         ("bos02", "ppc64el"),
         ("bos02", "s390x"),
         ("bos03", "amd64"),
+        ("bos03", "arm64"),
         ("bos03", "riscv64"),
         ("lcy02", "amd64"),
     ],