launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #31405
[Merge] ~lgp171188/launchpad-mojo-specs/+git/private:add-s390x-bos03-builders-production into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder
Guruprasad has proposed merging ~lgp171188/launchpad-mojo-specs/+git/private:add-s390x-bos03-builders-production into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
Commit message:
* vbuilder: restore bos01, bos02 s390x and ppc64el in production
We need this because they haven't been removed in production yet, unlike
in the qastaging environment.
* vbuilder: Add s390x bos03 builders to production
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~lgp171188/launchpad-mojo-specs/+git/private/+merge/472801
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/launchpad-mojo-specs/+git/private:add-s390x-bos03-builders-production into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index d24573a..08ee882 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -37,7 +37,7 @@
# will only be relevant for the remaining archs.
{%- 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"}' %}
+{%- set modifiers_bos03 = '{"arm64": "10.143.254.129", "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" %}
@@ -47,7 +47,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}} %}
+{%- 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": 1, "config_drive": false, "flavor": "vbuilder-s390x"}} %}
{%- set vbuilders_lcy02 = {"amd64": {"series": "focal", "count": 120}} %}
{%- set vbuilder_prefix = "" %}
{%- elif stage_name == "staging" %}
@@ -137,8 +137,8 @@
{%- set openstack_username = "vbuilder_staging" %}
{%- set openstack_username_bos03 = "launchpad-vbuilder-staging" %}
{%- set openstack_username_lcy02 = "launchpad-vbuilder-staging" %}
-{%- set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64-gpu": {"arch_base": "arm64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-nvidia-l4", "count": 1, "config_drive": false}, "ppc64el": {"series": "focal", "count": 1}, "s390x": {"series": "focal", "count": 1}} %}
-{%- set vbuilders_bos02 = {"ppc64el": {"series": "focal", "count": 1}, "s390x": {"series": "focal", "count": 1}} %}
+{%- set vbuilders_bos01 = {"amd64": {"series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "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": "focal", "count": 4}, "amd64-gpu": {"arch_base": "amd64", "arch_suffix": "-gpu", "series": "focal", "flavor": "vbuilder-gpu", "count": 1}, "arm64": {"series": "focal", "count": 1, "config_drive": false, "flavor": "vbuilder-arm64"}, "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": "focal", "count": 4}} %}
{%- set vbuilder_prefix = "qastaging-" %}
@@ -197,6 +197,74 @@ applications:
region: scalingstack-bos01
use_swift: false
visibility: private
+{%- if stage_name == "production" %}
+ glance-simplestreams-sync-bos01-ppc64el:
+ charm: {{ charm_dir }}/glance-simplestreams-sync
+ constraints: "{{ extra_constraints }}"
+ num_units: 1
+ options:
+ content_id_template: "{{ content_id_template }}"
+ custom_properties: 'hypervisor_type=kvm'
+ 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~(ppc64el)", "ftype~(disk1.img|disk.img)"]}]
+ name_prefix: "{{ name_prefix }}/"
+ 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-bos01-s390x:
+ charm: {{ charm_dir }}/glance-simplestreams-sync
+ constraints: "{{ extra_constraints }}"
+ num_units: 1
+ options:
+ content_id_template: "{{ content_id_template }}"
+ custom_properties: 'hypervisor_type=kvm'
+ mirror_list: |-
+ [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 3, item_filters: ["release~({{ gss_series }})", "arch~(s390x)", "ftype~(disk1.img|disk.img)"]}]
+ name_prefix: "{{ name_prefix }}/"
+ 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-bos02-ppc64el:
+ charm: {{ charm_dir }}/glance-simplestreams-sync
+ constraints: "{{ extra_constraints }}"
+ num_units: 1
+ options:
+ content_id_template: "{{ content_id_template }}"
+ custom_properties: 'hypervisor_type=kvm'
+ 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~(ppc64el)", "ftype~(disk1.img|disk.img)"]}]
+ name_prefix: "{{ name_prefix }}/"
+ openstack-auth-url: "http://keystone.infra.bos02.scalingstack:5000/v2.0";
+ openstack-tenant-name: "{{ openstack_tenant_name }}"
+ openstack-username: "{{ openstack_username }}"
+ region: scalingstack-bos02
+ use_swift: false
+ visibility: private
+ glance-simplestreams-sync-bos02-s390x:
+ charm: {{ charm_dir }}/glance-simplestreams-sync
+ constraints: "{{ extra_constraints }}"
+ num_units: 1
+ options:
+ content_id_template: "{{ content_id_template }}"
+ custom_properties: 'hypervisor_type=kvm'
+ mirror_list: |-
+ [{url: "http://cloud-images.ubuntu.com/daily/";, name_prefix: "ubuntu:released", path: "streams/v1/index.sjson", max: 3, item_filters: ["release~({{ gss_series }})", "arch~(s390x)", "ftype~(disk1.img|disk.img)"]}]
+ name_prefix: "{{ name_prefix }}/"
+ openstack-auth-url: "http://keystone.infra.bos02.scalingstack:5000/v2.0";
+ openstack-tenant-name: "{{ openstack_tenant_name }}"
+ openstack-username: "{{ openstack_username }}"
+ region: scalingstack-bos02
+ use_swift: false
+ visibility: private
+{%- endif %}
glance-simplestreams-sync-bos03-amd64:
charm: {{ charm_dir }}/glance-simplestreams-sync
constraints: "{{ extra_constraints }}"
@@ -265,7 +333,6 @@ applications:
use_swift: false
visibility: private
{%- endif %}
-{%- if stage_name == "qastaging" %}
glance-simplestreams-sync-bos03-s390x:
charm: {{ charm_dir }}/glance-simplestreams-sync
constraints: "{{ extra_constraints }}"
@@ -283,6 +350,7 @@ 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 }}"
@@ -344,6 +412,44 @@ 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
+ launchpad-buildd-image-modifier-bos01-ppc64el:
+ charm: {{ charm_dir }}/launchpad-buildd-image-modifier
+ options:
+ clamav-database-url: "{{ clamav_database_url }}"
+ launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+ linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+ 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
+{%- if stage_name == "production" %}
+ launchpad-buildd-image-modifier-bos01-s390x:
+ charm: {{ charm_dir }}/launchpad-buildd-image-modifier
+ options:
+ clamav-database-url: "{{ clamav_database_url }}"
+ launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+ linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+ 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-bos02-ppc64el:
+ charm: {{ charm_dir }}/launchpad-buildd-image-modifier
+ options:
+ clamav-database-url: "{{ clamav_database_url }}"
+ launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+ linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+ remote-modifiers: '{{ modifiers_bos02 }}'
+ 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-bos02-s390x:
+ charm: {{ charm_dir }}/launchpad-buildd-image-modifier
+ options:
+ clamav-database-url: "{{ clamav_database_url }}"
+ launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
+ linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
+ remote-modifiers: '{{ modifiers_bos02 }}'
+ 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:
@@ -389,7 +495,6 @@ applications:
remote-modifier-public-key: include-base64://{{ local_dir }}/id_rsa.imagebuilder.pub
sbuild-stalled-package-timeout: 1500
{%- endif %}
-{%- if stage_name == "qastaging" %}
launchpad-buildd-image-modifier-bos03-s390x:
charm: {{ charm_dir }}/launchpad-buildd-image-modifier
options:
@@ -399,6 +504,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 == "qastaging" %}
launchpad-buildd-image-modifier-bos03-ppc64el:
charm: {{ charm_dir }}/launchpad-buildd-image-modifier
options:
@@ -531,6 +637,12 @@ applications:
relations:
- ["glance-simplestreams-sync-bos01-amd64:image-modifier", "launchpad-buildd-image-modifier-bos01-amd64:image-modifier"]
- ["glance-simplestreams-sync-bos01-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64-gpu:image-modifier"]
+{%- if stage_name == "production" %}
+ - ["glance-simplestreams-sync-bos01-ppc64el:image-modifier", "launchpad-buildd-image-modifier-bos01-ppc64el:image-modifier"]
+ - ["glance-simplestreams-sync-bos01-s390x:image-modifier", "launchpad-buildd-image-modifier-bos01-s390x:image-modifier"]
+ - ["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"]
+{%- 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"]
@@ -549,6 +661,12 @@ relations:
- ["rabbitmq-server", "ntp"]
- ["glance-simplestreams-sync-bos01-amd64", "ntp"]
- ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
+{%- if stage_name == "production" %}
+ - ["glance-simplestreams-sync-bos01-ppc64el", "ntp"]
+ - ["glance-simplestreams-sync-bos01-s390x", "ntp"]
+ - ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
+ - ["glance-simplestreams-sync-bos02-s390x", "ntp"]
+{%- endif %}
- ["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 5175da5..e0a418f 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -15,6 +15,10 @@ targets_by_stage = {
"qastaging": [
("bos01", "amd64", "focal"),
("bos01", "arm64-gpu", "focal"),
+ ("bos01", "ppc64el", "focal"),
+ ("bos01", "s390x", "focal"),
+ ("bos02", "ppc64el", "focal"),
+ ("bos02", "s390x", "focal"),
("bos03", "amd64", "focal"),
("bos03", "amd64-gpu", "focal"),
("bos03", "arm64", "focal"),
@@ -43,6 +47,7 @@ targets_by_stage = {
("bos03", "amd64-gpu", "focal"),
("bos03", "arm64", "focal"),
("bos03", "riscv64", "jammy"),
+ ("bos03", "s390x", "focal"),
("lcy02", "amd64", "focal"),
],
}
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 0210a14..3ba5c71 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -10,6 +10,10 @@ targets_by_stage = {
"qastaging": [
("bos01", "amd64"),
("bos01", "arm64-gpu"),
+ ("bos01", "ppc64el"),
+ ("bos01", "s390x"),
+ ("bos02", "ppc64el"),
+ ("bos02", "s390x"),
("bos03", "amd64"),
("bos03", "amd64-gpu"),
("bos03", "arm64"),
@@ -38,6 +42,7 @@ targets_by_stage = {
("bos03", "amd64-gpu"),
("bos03", "arm64"),
("bos03", "riscv64"),
+ ("bos03", "s390x"),
("lcy02", "amd64"),
],
}
Follow ups
