Simone Pelosi has proposed merging
~pelpsi/launchpad-mojo-specs/+git/private:remove-g-s-s-and-image-modifier-for-unused-arm64
into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
Commit message:
Remove g-s-s and image-modifier for removed bos01 and bos02 arm64 builders
This is a follow-up merge proposal to clean-up our environment removing
all the unused charms.
arm64 builders removal MP
https://code.launchpad.net/~pelpsi/launchpad-mojo-specs/+git/private/+merge/471078
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~pelpsi/launchpad-mojo-specs/+git/private/+merge/471803
--
Your team Launchpad code reviewers is requested to review the proposed merge of
~pelpsi/launchpad-mojo-specs/+git/private:remove-g-s-s-and-image-modifier-for-unused-arm64
into ~launchpad/launchpad-mojo-specs/+git/private:vbuilder.
diff --git a/vbuilder/bundle.yaml b/vbuilder/bundle.yaml
index 1e7c83d..bb58840 100644
--- a/vbuilder/bundle.yaml
+++ b/vbuilder/bundle.yaml
@@ -177,23 +177,6 @@ applications:
region: scalingstack-bos01
use_swift: false
visibility: private
- glance-simplestreams-sync-bos01-arm64:
- charm: {{ charm_dir }}/glance-simplestreams-sync
- constraints: "{{ extra_constraints }}"
- num_units: 1
- options:
- content_id_template: "{{ content_id_template }}"
- custom_properties: 'hypervisor_type=kvm hw_firmware_type=uefi'
- 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~(arm64|aarch64)", "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-arm64-gpu:
charm: {{ charm_dir }}/glance-simplestreams-sync
constraints: "{{ extra_constraints }}"
@@ -245,22 +228,6 @@ applications:
region: scalingstack-bos01
use_swift: false
visibility: private
- glance-simplestreams-sync-bos02-arm64:
- charm: {{ charm_dir }}/glance-simplestreams-sync
- constraints: "{{ extra_constraints }}"
- num_units: 1
- options:
- content_id_template: "{{ content_id_template }}"
- custom_properties: 'hypervisor_type=kvm hw_firmware_type=uefi'
- 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~(arm64|aarch64)", "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-ppc64el:
charm: {{ charm_dir }}/glance-simplestreams-sync
constraints: "{{ extra_constraints }}"
@@ -413,15 +380,6 @@ applications:
# token.
launchpad-buildd-repository: "{{ launchpad_buildd_repository }}"
linux-command-line-extra: "systemd.unified_cgroup_hierarchy=false"
- launchpad-buildd-image-modifier-bos01-arm64:
- 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 compat_uts_machine=armv7l"
- 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-arm64-gpu:
charm: {{ charm_dir }}/launchpad-buildd-image-modifier
options:
@@ -450,15 +408,6 @@ 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-bos02-arm64:
- 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 compat_uts_machine=armv7l"
- 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-ppc64el:
charm: {{ charm_dir }}/launchpad-buildd-image-modifier
options:
@@ -654,11 +603,9 @@ applications:
install_method: snap
relations:
- ["glance-simplestreams-sync-bos01-amd64:image-modifier", "launchpad-buildd-image-modifier-bos01-amd64:image-modifier"]
- - ["glance-simplestreams-sync-bos01-arm64:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64:image-modifier"]
- ["glance-simplestreams-sync-bos01-arm64-gpu:image-modifier", "launchpad-buildd-image-modifier-bos01-arm64-gpu:image-modifier"]
- ["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-arm64:image-modifier", "launchpad-buildd-image-modifier-bos02-arm64: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"]
- ["glance-simplestreams-sync-bos03-amd64:image-modifier", "launchpad-buildd-image-modifier-bos03-amd64:image-modifier"]
@@ -677,11 +624,9 @@ relations:
- ["vbuilder-manage-lcy02:amqp", "rabbitmq-server:amqp"]
- ["rabbitmq-server", "ntp"]
- ["glance-simplestreams-sync-bos01-amd64", "ntp"]
- - ["glance-simplestreams-sync-bos01-arm64", "ntp"]
- ["glance-simplestreams-sync-bos01-arm64-gpu", "ntp"]
- ["glance-simplestreams-sync-bos01-ppc64el", "ntp"]
- ["glance-simplestreams-sync-bos01-s390x", "ntp"]
- - ["glance-simplestreams-sync-bos02-arm64", "ntp"]
- ["glance-simplestreams-sync-bos02-ppc64el", "ntp"]
- ["glance-simplestreams-sync-bos02-s390x", "ntp"]
- ["glance-simplestreams-sync-bos03-amd64", "ntp"]
diff --git a/vbuilder/rebuild-images b/vbuilder/rebuild-images
index 84a68b1..95107ba 100755
--- a/vbuilder/rebuild-images
+++ b/vbuilder/rebuild-images
@@ -42,10 +42,8 @@ targets_by_stage = {
],
"production": [
("bos01", "amd64", "focal"),
- ("bos01", "arm64", "focal"),
("bos01", "ppc64el", "focal"),
("bos01", "s390x", "focal"),
- ("bos02", "arm64", "focal"),
("bos02", "ppc64el", "focal"),
("bos02", "s390x", "focal"),
("bos03", "amd64", "focal"),
diff --git a/vbuilder/upgrade-charms b/vbuilder/upgrade-charms
index 6fc6a6a..dc2e420 100755
--- a/vbuilder/upgrade-charms
+++ b/vbuilder/upgrade-charms
@@ -37,10 +37,8 @@ targets_by_stage = {
],
"production": [
("bos01", "amd64"),
- ("bos01", "arm64"),
("bos01", "ppc64el"),
("bos01", "s390x"),
- ("bos02", "arm64"),
("bos02", "ppc64el"),
("bos02", "s390x"),
("bos03", "amd64"),
_______________________________________________
Mailing list: https://launchpad.net/~launchpad-reviewers
Post to : launchpad-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~launchpad-reviewers
More help : https://help.launchpad.net/ListHelp
