From 192bf2f0902d5ee622b1d8b33e7122c187989fbb Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Sun, 23 Jan 2022 14:36:26 +0000 Subject: [PATCH] Branch updates to work with charmhub for stable/rocky Change-Id: I3f271910bb2beace4ecf1629273a1d074d8e8fa9 --- .gitreview | 2 +- charmcraft.yaml | 13 ++++ metadata.yaml | 1 + osci.yaml | 15 +---- src/config.yaml | 2 +- src/metadata.yaml | 5 -- src/tests/bundles/bionic-queens.yaml | 12 ++-- src/tests/bundles/bionic-rocky.yaml | 12 ++-- src/tests/bundles/bionic-stein.yaml | 41 ------------- src/tests/bundles/bionic-train.yaml | 41 ------------- src/tests/bundles/bionic-ussuri.yaml | 41 ------------- src/tests/bundles/focal-ussuri.yaml | 85 -------------------------- src/tests/bundles/focal-victoria.yaml | 85 -------------------------- src/tests/bundles/focal-wallaby.yaml | 85 -------------------------- src/tests/bundles/groovy-victoria.yaml | 85 -------------------------- src/tests/bundles/hirsute-wallaby.yaml | 85 -------------------------- src/tests/bundles/xenial-pike.yaml | 41 ------------- src/tests/bundles/xenial-queens.yaml | 41 ------------- src/tests/tests.yaml | 20 +----- 19 files changed, 38 insertions(+), 674 deletions(-) create mode 100644 charmcraft.yaml create mode 120000 metadata.yaml delete mode 100644 src/tests/bundles/bionic-stein.yaml delete mode 100644 src/tests/bundles/bionic-train.yaml delete mode 100644 src/tests/bundles/bionic-ussuri.yaml delete mode 100644 src/tests/bundles/focal-ussuri.yaml delete mode 100644 src/tests/bundles/focal-victoria.yaml delete mode 100644 src/tests/bundles/focal-wallaby.yaml delete mode 100644 src/tests/bundles/groovy-victoria.yaml delete mode 100644 src/tests/bundles/hirsute-wallaby.yaml delete mode 100644 src/tests/bundles/xenial-pike.yaml delete mode 100644 src/tests/bundles/xenial-queens.yaml diff --git a/.gitreview b/.gitreview index 22236c4..5a32534 100644 --- a/.gitreview +++ b/.gitreview @@ -3,4 +3,4 @@ host=review.opendev.org port=29418 project=openstack/charm-manila-generic.git -defaultbranch=stable/21.10 +defaultbranch=stable/rocky diff --git a/charmcraft.yaml b/charmcraft.yaml new file mode 100644 index 0000000..a850351 --- /dev/null +++ b/charmcraft.yaml @@ -0,0 +1,13 @@ +type: charm + +parts: + charm: + source: src/ + plugin: reactive + build-snaps: [charm] + +bases: + - name: ubuntu + channel: "20.04" + architectures: + - amd64 diff --git a/metadata.yaml b/metadata.yaml new file mode 120000 index 0000000..0768683 --- /dev/null +++ b/metadata.yaml @@ -0,0 +1 @@ +src/metadata.yaml \ No newline at end of file diff --git a/osci.yaml b/osci.yaml index e17a471..b1b11d8 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,17 +1,8 @@ - project: templates: - - charm-unit-jobs - check: - jobs: - - bionic-queens - - bionic-stein - - bionic-train - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - - groovy-victoria - - hirsute-wallaby + - charm-unit-jobs-py36 + - charm-rocky-functional-jobs + - charm-queens-functional-jobs vars: needs_charm_build: true charm_build_name: manila-generic diff --git a/src/config.yaml b/src/config.yaml index 069c150..e38b154 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -1,6 +1,6 @@ options: openstack-origin: - default: distro + default: rocky type: string description: | Repository from which to install. May be one of the following: diff --git a/src/metadata.yaml b/src/metadata.yaml index 2756fc3..f5b790c 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -15,12 +15,7 @@ description: | tags: - openstack series: -- xenial - bionic -- focal -- groovy -- hirsute -- impish subordinate: true provides: manila-plugin: diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml index 41317f8..fa8f46a 100644 --- a/src/tests/bundles/bionic-queens.yaml +++ b/src/tests/bundles/bionic-queens.yaml @@ -1,23 +1,27 @@ series: bionic services: manila: - charm: cs:~openstack-charmers/manila + charm: ch:manila num_units: 1 options: default-share-backend: generic + channel: queens/edge manila-generic: charm: ../../../manila-generic options: driver-handles-share-servers: False rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 + channel: 3.6/edge percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 + channel: 5.7/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 + channel: queens/edge relations: - - manila:manila-plugin diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml index c45dab4..ce3bd21 100644 --- a/src/tests/bundles/bionic-rocky.yaml +++ b/src/tests/bundles/bionic-rocky.yaml @@ -3,30 +3,34 @@ options: source: &source cloud:bionic-rocky services: manila: - charm: cs:~openstack-charmers/manila + charm: ch:manila num_units: 1 options: default-share-backend: generic openstack-origin: *source + channel: rocky/edge manila-generic: charm: ../../../manila-generic options: driver-handles-share-servers: False rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 options: source: *source + channel: 3.6/edge percona-cluster: - charm: cs:~openstack-charmers/percona-cluster + charm: ch:percona-cluster num_units: 1 options: source: *source + channel: 5.7/edge keystone: - charm: cs:~openstack-charmers/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *source + channel: rocky/edge relations: - - manila:manila-plugin diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 1f2f71a..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,41 +0,0 @@ -series: bionic -options: - source: &source cloud:bionic-stein -services: - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *source - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *source - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *source - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - -relations: - - - manila:manila-plugin - - manila-generic - - - manila - - rabbitmq-server - - - manila - - keystone - - - keystone - - percona-cluster - - - manila - - percona-cluster diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index 6412ebe..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,41 +0,0 @@ -series: bionic -options: - source: &source cloud:bionic-train -services: - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *source - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *source - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *source - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - -relations: - - - manila:manila-plugin - - manila-generic - - - manila - - rabbitmq-server - - - manila - - keystone - - - keystone - - percona-cluster - - - manila - - percona-cluster diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index d57b48a..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,41 +0,0 @@ -series: bionic -options: - source: &source cloud:bionic-ussuri -services: - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *source - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *source - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *source - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - -relations: - - - manila:manila-plugin - - manila-generic - - - manila - - rabbitmq-server - - - manila - - keystone - - - keystone - - percona-cluster - - - manila - - percona-cluster diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index f135b85..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,85 +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': - -services: - - manila-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *openstack-origin - to: - - '3' - - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - -relations: - - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'manila:manila-plugin' - - 'manila-generic' - - - - 'manila' - - 'rabbitmq-server' - - - - 'manila' - - 'keystone' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 4628640..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,85 +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': - -services: - - manila-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *openstack-origin - to: - - '3' - - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - -relations: - - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'manila:manila-plugin' - - 'manila-generic' - - - - 'manila' - - 'rabbitmq-server' - - - - 'manila' - - 'keystone' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 2d685c8..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,85 +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': - -services: - - manila-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *openstack-origin - to: - - '3' - - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - -relations: - - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'manila:manila-plugin' - - 'manila-generic' - - - - 'manila' - - 'rabbitmq-server' - - - - 'manila' - - 'keystone' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml deleted file mode 100644 index 6a45478..0000000 --- a/src/tests/bundles/groovy-victoria.yaml +++ /dev/null @@ -1,85 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: groovy - -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': - -services: - - manila-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *openstack-origin - to: - - '3' - - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - -relations: - - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'manila:manila-plugin' - - 'manila-generic' - - - - 'manila' - - 'rabbitmq-server' - - - - 'manila' - - 'keystone' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 781d990..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,85 +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': - -services: - - manila-mysql-router: - charm: cs:~openstack-charmers/mysql-router - keystone-mysql-router: - charm: cs:~openstack-charmers/mysql-router - - mysql-innodb-cluster: - charm: cs:~openstack-charmers/mysql-innodb-cluster - num_units: 3 - options: - source: *openstack-origin - to: - - '0' - - '1' - - '2' - - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *openstack-origin - to: - - '3' - - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *openstack-origin - to: - - '4' - - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '5' - -relations: - - - - 'manila:shared-db' - - 'manila-mysql-router:shared-db' - - - 'manila-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'manila:manila-plugin' - - 'manila-generic' - - - - 'manila' - - 'rabbitmq-server' - - - - 'manila' - - 'keystone' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' diff --git a/src/tests/bundles/xenial-pike.yaml b/src/tests/bundles/xenial-pike.yaml deleted file mode 100644 index 5bd5b2f..0000000 --- a/src/tests/bundles/xenial-pike.yaml +++ /dev/null @@ -1,41 +0,0 @@ -series: xenial -options: - source: &source cloud:xenial-pike -services: - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *source - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *source - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *source - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - -relations: - - - manila:manila-plugin - - manila-generic - - - manila - - rabbitmq-server - - - manila - - keystone - - - keystone - - percona-cluster - - - manila - - percona-cluster diff --git a/src/tests/bundles/xenial-queens.yaml b/src/tests/bundles/xenial-queens.yaml deleted file mode 100644 index 9d1ee94..0000000 --- a/src/tests/bundles/xenial-queens.yaml +++ /dev/null @@ -1,41 +0,0 @@ -series: xenial -options: - source: &source cloud:xenial-queens -services: - manila: - charm: cs:~openstack-charmers/manila - num_units: 1 - options: - default-share-backend: generic - openstack-origin: *source - manila-generic: - charm: ../../../manila-generic - options: - driver-handles-share-servers: False - rabbitmq-server: - charm: cs:~openstack-charmers/rabbitmq-server - num_units: 1 - options: - source: *source - percona-cluster: - charm: cs:~openstack-charmers/percona-cluster - num_units: 1 - options: - source: *source - keystone: - charm: cs:~openstack-charmers/keystone - num_units: 1 - options: - openstack-origin: *source - -relations: - - - manila:manila-plugin - - manila-generic - - - manila - - rabbitmq-server - - - manila - - keystone - - - keystone - - percona-cluster - - - manila - - percona-cluster diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index d89aa0e..699900c 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,23 +1,13 @@ charm_name: manila-generic gate_bundles: + - bionic-rocky - bionic-queens - - bionic-stein - - bionic-train - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - - groovy-victoria smoke_bundles: - - focal-ussuri - -dev_bundles: - - xenial-pike - - xenial-queens - bionic-rocky - - hirsute-wallaby + +dev_bundles: [] target_deploy_status: {} @@ -26,7 +16,3 @@ tests: configure: - zaza.openstack.charm_tests.keystone.setup.add_demo_user - -tests_options: - force_deploy: - - hirsute-wallaby