From fc2fd1b6498758e5ad3207478fffa9e60c606e71 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 27 Jan 2022 18:02:09 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: I99c71d7dc201829ebfd5c9d0d6214f72fe0709ba --- charmcraft.yaml | 27 ++++++++ metadata.yaml | 3 - osci.yaml | 19 +---- tests/bundles/bionic-queens.yaml | 44 ------------ tests/bundles/bionic-rocky.yaml | 51 -------------- tests/bundles/bionic-stein.yaml | 51 -------------- tests/bundles/bionic-train-gr-r1.yaml | 76 -------------------- tests/bundles/bionic-train-gr-r2.yaml | 47 ------------- tests/bundles/bionic-train.yaml | 51 -------------- tests/bundles/bionic-ussuri.yaml | 51 -------------- tests/bundles/focal-ussuri-gr-r1.yaml | 83 ---------------------- tests/bundles/focal-ussuri-gr-r2.yaml | 47 ------------- tests/bundles/focal-ussuri.yaml | 99 --------------------------- tests/bundles/focal-victoria.yaml | 99 --------------------------- tests/bundles/focal-wallaby.yaml | 99 --------------------------- tests/bundles/focal-xena.yaml | 18 +++-- tests/bundles/focal-yoga.yaml | 18 +++-- tests/bundles/hirsute-wallaby.yaml | 99 --------------------------- tests/bundles/impish-xena.yaml | 18 +++-- tests/bundles/jammy-yoga.yaml | 18 +++-- tests/tests.yaml | 18 +---- 21 files changed, 78 insertions(+), 958 deletions(-) create mode 100644 charmcraft.yaml delete mode 100644 tests/bundles/bionic-queens.yaml delete mode 100644 tests/bundles/bionic-rocky.yaml delete mode 100644 tests/bundles/bionic-stein.yaml delete mode 100644 tests/bundles/bionic-train-gr-r1.yaml delete mode 100644 tests/bundles/bionic-train-gr-r2.yaml delete mode 100644 tests/bundles/bionic-train.yaml delete mode 100644 tests/bundles/bionic-ussuri.yaml delete mode 100644 tests/bundles/focal-ussuri-gr-r1.yaml delete mode 100644 tests/bundles/focal-ussuri-gr-r2.yaml delete mode 100644 tests/bundles/focal-ussuri.yaml delete mode 100644 tests/bundles/focal-victoria.yaml delete mode 100644 tests/bundles/focal-wallaby.yaml delete mode 100644 tests/bundles/hirsute-wallaby.yaml diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..ba84f31 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,27 @@ +type: charm + +parts: + charm: + plugin: dump + source: . + prime: + - actions/* + - files/* + - hooks/* + - lib/* + - templates/* + - actions.yaml + - config.yaml + - copyright + - hardening.yaml + - icon.svg + - LICENSE + - Makefile + - metadata.yaml + - README.md + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml index 43840b2..571caff 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -18,10 +18,7 @@ tags: - openstack - file-servers series: -- bionic - focal -- groovy -- hirsute - impish extra-bindings: replication: diff --git a/osci.yaml b/osci.yaml index 64af205..78c47bd 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,21 +1,6 @@ - project: templates: - - charm-yoga-unit-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-yoga-functional-jobs - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs - - charm-stein-functional-jobs - - charm-queens-functional-jobs - check: - jobs: - - focal-ussuri-gr-swift - -- job: - name: focal-ussuri-gr-swift - parent: func-target - dependencies: - - focal-ussuri - vars: - tox_extra_args: swift_gr_region1:focal-ussuri-gr-r1 swift_gr_region2:focal-ussuri-gr-r2 diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 586508d..0000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,44 +0,0 @@ -series: bionic -applications: - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - zone: 1 -relations: -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-storage:swift-storage - - swift-proxy:swift-storage -- - glance:object-store - - swift-proxy:object-store diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 46d4640..0000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,51 +0,0 @@ -series: bionic -applications: - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: cloud:bionic-rocky - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-rocky - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: cloud:bionic-rocky - zone: 1 -relations: -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-storage:swift-storage - - swift-proxy:swift-storage -- - glance:object-store - - swift-proxy:object-store diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 1aaba54..0000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,51 +0,0 @@ -series: bionic -applications: - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: cloud:bionic-stein - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-stein - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: cloud:bionic-stein - zone: 1 -relations: -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-storage:swift-storage - - swift-proxy:swift-storage -- - glance:object-store - - swift-proxy:object-store diff --git a/tests/bundles/bionic-train-gr-r1.yaml b/tests/bundles/bionic-train-gr-r1.yaml deleted file mode 100644 index 544ff54..0000000 --- a/tests/bundles/bionic-train-gr-r1.yaml +++ /dev/null @@ -1,76 +0,0 @@ -series: bionic -local_overlay_enabled: false -applications: - swift-proxy-region1: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - region: RegionOne - zone-assignment: manual - replicas: 2 - enable-multi-region: true - swift-hash: "global-cluster" - read-affinity: "r1=100, r2=200" - write-affinity: "r1, r2" - write-affinity-node-count: '1' - openstack-origin: cloud:bionic-train - swift-storage-region1-zone1: - charm: ../../. - num_units: 1 - options: - storage-region: 1 - zone: 1 - block-device: /etc/swift/storage.img|2G - openstack-origin: cloud:bionic-train - swift-storage-region1-zone2: - charm: ../../. - num_units: 1 - options: - storage-region: 1 - zone: 2 - block-device: /etc/swift/storage.img|2G - openstack-origin: cloud:bionic-train - swift-storage-region1-zone3: - charm: ../../. - num_units: 1 - options: - storage-region: 1 - zone: 3 - block-device: /etc/swift/storage.img|2G - openstack-origin: cloud:bionic-train - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-train - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train -relations: - - - swift-proxy-region1:swift-storage - - swift-storage-region1-zone1:swift-storage - - - swift-proxy-region1:swift-storage - - swift-storage-region1-zone2:swift-storage - - - swift-proxy-region1:swift-storage - - swift-storage-region1-zone3:swift-storage - - - keystone:shared-db - - percona-cluster:shared-db - - - glance:shared-db - - percona-cluster:shared-db - - - glance:identity-service - - keystone:identity-service - - - swift-proxy-region1:identity-service - - keystone:identity-service - - - glance:object-store - - swift-proxy-region1:object-store diff --git a/tests/bundles/bionic-train-gr-r2.yaml b/tests/bundles/bionic-train-gr-r2.yaml deleted file mode 100644 index f924974..0000000 --- a/tests/bundles/bionic-train-gr-r2.yaml +++ /dev/null @@ -1,47 +0,0 @@ -series: bionic -local_overlay_enabled: false -applications: - swift-proxy-region2: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - region: RegionTwo - zone-assignment: manual - replicas: 2 - enable-multi-region: true - swift-hash: "global-cluster" - read-affinity: "r1=100, r2=200" - write-affinity: "r1, r2" - write-affinity-node-count: '1' - openstack-origin: cloud:bionic-train - swift-storage-region2-zone1: - charm: ../../. - num_units: 1 - options: - storage-region: 2 - zone: 1 - block-device: /etc/swift/storage.img|2G - openstack-origin: cloud:bionic-train - swift-storage-region2-zone2: - charm: ../../. - num_units: 1 - options: - storage-region: 2 - zone: 2 - block-device: /etc/swift/storage.img|2G - openstack-origin: cloud:bionic-train - swift-storage-region2-zone3: - charm: ../../. - num_units: 1 - options: - storage-region: 2 - zone: 3 - block-device: /etc/swift/storage.img|2G - openstack-origin: cloud:bionic-train -relations: - - - swift-proxy-region2:swift-storage - - swift-storage-region2-zone1:swift-storage - - - swift-proxy-region2:swift-storage - - swift-storage-region2-zone2:swift-storage - - - swift-proxy-region2:swift-storage - - swift-storage-region2-zone3:swift-storage diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index 2ee9dd2..0000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,51 +0,0 @@ -series: bionic -applications: - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: cloud:bionic-train - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-train - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-train - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: cloud:bionic-train - zone: 1 -relations: -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-storage:swift-storage - - swift-proxy:swift-storage -- - glance:object-store - - swift-proxy:object-store diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index a607b4f..0000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,51 +0,0 @@ -series: bionic -applications: - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - series: bionic - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: cloud:bionic-ussuri - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - options: - dataset-size: 25% - max-connections: 1000 - source: cloud:bionic-ussuri - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - openstack-origin: cloud:bionic-ussuri - zone: 1 -relations: -- - keystone:shared-db - - percona-cluster:shared-db -- - glance:shared-db - - percona-cluster:shared-db -- - glance:identity-service - - keystone:identity-service -- - swift-proxy:identity-service - - keystone:identity-service -- - swift-storage:swift-storage - - swift-proxy:swift-storage -- - glance:object-store - - swift-proxy:object-store diff --git a/tests/bundles/focal-ussuri-gr-r1.yaml b/tests/bundles/focal-ussuri-gr-r1.yaml deleted file mode 100644 index c211764..0000000 --- a/tests/bundles/focal-ussuri-gr-r1.yaml +++ /dev/null @@ -1,83 +0,0 @@ -series: focal -local_overlay_enabled: false -applications: - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: distro - swift-proxy-region1: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - region: RegionOne - zone-assignment: manual - replicas: 2 - enable-multi-region: true - swift-hash: "global-cluster" - read-affinity: "r1=100, r2=200" - write-affinity: "r1, r2" - write-affinity-node-count: '1' - openstack-origin: distro - swift-storage-region1-zone1: - charm: ../../. - num_units: 1 - options: - storage-region: 1 - zone: 1 - block-device: /etc/swift/storage.img|2G - openstack-origin: distro - swift-storage-region1-zone2: - charm: ../../. - num_units: 1 - options: - storage-region: 1 - zone: 2 - block-device: /etc/swift/storage.img|2G - openstack-origin: distro - swift-storage-region1-zone3: - charm: ../../. - num_units: 1 - options: - storage-region: 1 - zone: 3 - block-device: /etc/swift/storage.img|2G - openstack-origin: distro - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: distro - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: distro -relations: - - - keystone:shared-db - - keystone-mysql-router:shared-db - - - keystone-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - glance:shared-db - - glance-mysql-router:shared-db - - - glance-mysql-router:db-router - - mysql-innodb-cluster:db-router - - - swift-proxy-region1:swift-storage - - swift-storage-region1-zone1:swift-storage - - - swift-proxy-region1:swift-storage - - swift-storage-region1-zone2:swift-storage - - - swift-proxy-region1:swift-storage - - swift-storage-region1-zone3:swift-storage - - - glance:identity-service - - keystone:identity-service - - - swift-proxy-region1:identity-service - - keystone:identity-service - - - glance:object-store - - swift-proxy-region1:object-store diff --git a/tests/bundles/focal-ussuri-gr-r2.yaml b/tests/bundles/focal-ussuri-gr-r2.yaml deleted file mode 100644 index bd5dca7..0000000 --- a/tests/bundles/focal-ussuri-gr-r2.yaml +++ /dev/null @@ -1,47 +0,0 @@ -series: focal -local_overlay_enabled: false -applications: - swift-proxy-region2: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - region: RegionTwo - zone-assignment: manual - replicas: 2 - enable-multi-region: true - swift-hash: "global-cluster" - read-affinity: "r1=100, r2=200" - write-affinity: "r1, r2" - write-affinity-node-count: '1' - openstack-origin: distro - swift-storage-region2-zone1: - charm: ../../. - num_units: 1 - options: - storage-region: 2 - zone: 1 - block-device: /etc/swift/storage.img|2G - openstack-origin: distro - swift-storage-region2-zone2: - charm: ../../. - num_units: 1 - options: - storage-region: 2 - zone: 2 - block-device: /etc/swift/storage.img|2G - openstack-origin: distro - swift-storage-region2-zone3: - charm: ../../. - num_units: 1 - options: - storage-region: 2 - zone: 3 - block-device: /etc/swift/storage.img|2G - openstack-origin: distro -relations: - - - swift-proxy-region2:swift-storage - - swift-storage-region2-zone1:swift-storage - - - swift-proxy-region2:swift-storage - - swift-storage-region2-zone2:swift-storage - - - swift-proxy-region2:swift-storage - - swift-storage-region2-zone3:swift-storage diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 963a268..0000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,99 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '4' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - zone: 1 - openstack-origin: *openstack-origin - to: - - '6' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'swift-proxy:identity-service' - - 'keystone:identity-service' - - - - 'swift-storage:swift-storage' - - 'swift-proxy:swift-storage' - - - - 'glance:object-store' - - 'swift-proxy:object-store' diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 3a31e4d..0000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,99 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '4' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - zone: 1 - openstack-origin: *openstack-origin - to: - - '6' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'swift-proxy:identity-service' - - 'keystone:identity-service' - - - - 'swift-storage:swift-storage' - - 'swift-proxy:swift-storage' - - - - 'glance:object-store' - - 'swift-proxy:object-store' diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 281d0fb..0000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,99 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '4' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - zone: 1 - openstack-origin: *openstack-origin - to: - - '6' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'swift-proxy:identity-service' - - 'keystone:identity-service' - - - - 'swift-storage:swift-storage' - - 'swift-proxy:swift-storage' - - - - 'glance:object-store' - - 'swift-proxy:object-store' diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index 8292d40..d747fea 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -20,12 +20,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -33,18 +35,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: zone-assignment: manual @@ -53,15 +57,17 @@ applications: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge swift-storage: charm: swift-storage diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index f7e5693..e4e3ed1 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -20,12 +20,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -33,18 +35,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: zone-assignment: manual @@ -53,15 +57,17 @@ applications: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge swift-storage: charm: swift-storage diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index d4fe79f..0000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,99 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -comment: -- 'machines section to decide order of deployment. database sooner = faster' -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - '6': - -applications: - - keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - keystone: - expose: True - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy - num_units: 1 - options: - zone-assignment: manual - replicas: 1 - swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae - openstack-origin: *openstack-origin - to: - - '4' - - glance: - expose: True - charm: cs:~openstack-charmers-next/glance - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - - swift-storage: - charm: swift-storage - num_units: 1 - storage: - block-devices: 'cinder,10G' - options: - zone: 1 - openstack-origin: *openstack-origin - to: - - '6' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:shared-db' - - 'glance-mysql-router:shared-db' - - - 'glance-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'glance:identity-service' - - 'keystone:identity-service' - - - - 'swift-proxy:identity-service' - - 'keystone:identity-service' - - - - 'swift-storage:swift-storage' - - 'swift-proxy:swift-storage' - - - - 'glance:object-store' - - 'swift-proxy:object-store' diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 37ab796..3962786 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -20,12 +20,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -33,18 +35,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: zone-assignment: manual @@ -53,15 +57,17 @@ applications: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge swift-storage: charm: swift-storage diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 9b0e031..1fbcc6a 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -20,12 +20,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster + charm: ch:mysql-innodb-cluster num_units: 3 options: source: *openstack-origin @@ -33,18 +35,20 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: ch:swift-proxy num_units: 1 options: zone-assignment: manual @@ -53,15 +57,17 @@ applications: openstack-origin: *openstack-origin to: - '4' + channel: latest/edge glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: ch:glance num_units: 1 options: openstack-origin: *openstack-origin to: - '5' + channel: latest/edge swift-storage: charm: swift-storage diff --git a/tests/tests.yaml b/tests/tests.yaml index dfe14d8..52c3214 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,28 +1,13 @@ charm_name: swift-storage gate_bundles: - - bionic-queens - - bionic-stein - - bionic-ussuri - - focal-ussuri - - focal-ussuri-gr: - - swift_gr_region1: focal-ussuri-gr-r1 - - swift_gr_region2: focal-ussuri-gr-r2 - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena smoke_bundles: - - focal-ussuri + - focal-xena dev_bundles: - - bionic-rocky - - bionic-train - - bionic-train-gr: - - swift_gr_region1: bionic-train-gr-r1 - - swift_gr_region2: bionic-train-gr-r2 - focal-yoga - jammy-yoga @@ -34,6 +19,5 @@ tests: tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga