From 127d176b2b5e81bd4aa1c7987825ec15c1081bde Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 27 Jan 2022 13:26:26 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: I5a4bb25ab1a249b5a790695da1baaa32343db568 --- charmcraft.yaml | 27 +++++++++++++++ metadata.yaml | 3 -- osci.yaml | 10 ++---- tests/bundles/bionic-queens.yaml | 31 ----------------- tests/bundles/bionic-rocky.yaml | 32 ------------------ tests/bundles/bionic-stein.yaml | 32 ------------------ tests/bundles/bionic-train.yaml | 32 ------------------ tests/bundles/bionic-ussuri.yaml | 32 ------------------ tests/bundles/focal-ussuri.yaml | 54 ------------------------------ tests/bundles/focal-victoria.yaml | 54 ------------------------------ tests/bundles/focal-wallaby.yaml | 54 ------------------------------ tests/bundles/focal-xena.yaml | 9 +++-- tests/bundles/focal-yoga.yaml | 9 +++-- tests/bundles/hirsute-wallaby.yaml | 54 ------------------------------ tests/bundles/impish-xena.yaml | 9 +++-- tests/bundles/jammy-yoga.yaml | 9 +++-- tests/tests.yaml | 12 +------ 17 files changed, 55 insertions(+), 408 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.yaml delete mode 100644 tests/bundles/bionic-ussuri.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 c67bedc..23b7e64 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -7,10 +7,7 @@ description: | tags: - misc series: -- bionic - focal -- groovy -- hirsute - impish requires: juju-info: diff --git a/osci.yaml b/osci.yaml index 0b2a0aa..da6cd31 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,10 +1,6 @@ - project: templates: - - charm-yoga-unit-jobs - - charm-yoga-functional-jobs + - charm-unit-jobs-py38 + - charm-unit-jobs-py39 - charm-xena-functional-jobs - - charm-wallaby-functional-jobs - - charm-victoria-functional-jobs - - charm-ussuri-functional-jobs - - charm-stein-functional-jobs - - charm-queens-functional-jobs + - charm-yoga-functional-jobs diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 676ba74..0000000 --- a/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,31 +0,0 @@ -series: bionic - -machines: - '0': - '1': - '2': - '3': - -relations: - - ['keystone:shared-db', 'percona-cluster:shared-db'] - - ['hacluster:ha', 'keystone:ha'] - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - token-expiration: 60 - to: - - '1' - - '2' - - '3' - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 363e40e..0000000 --- a/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,32 +0,0 @@ -series: bionic - -machines: - '0': - '1': - '2': - '3': - -relations: - - ['keystone:shared-db', 'percona-cluster:shared-db'] - - ['hacluster:ha', 'keystone:ha'] - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - openstack-origin: cloud:bionic-rocky - token-expiration: 60 - to: - - '1' - - '2' - - '3' - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml deleted file mode 100644 index 14a2550..0000000 --- a/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,32 +0,0 @@ -series: bionic - -machines: - '0': - '1': - '2': - '3': - -relations: - - ['keystone:shared-db', 'percona-cluster:shared-db'] - - ['hacluster:ha', 'keystone:ha'] - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - openstack-origin: cloud:bionic-stein - token-expiration: 60 - to: - - '1' - - '2' - - '3' - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml deleted file mode 100644 index 1a77f37..0000000 --- a/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,32 +0,0 @@ -series: bionic - -machines: - '0': - '1': - '2': - '3': - -relations: - - ['keystone:shared-db', 'percona-cluster:shared-db'] - - ['hacluster:ha', 'keystone:ha'] - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - openstack-origin: cloud:bionic-train - token-expiration: 60 - to: - - '1' - - '2' - - '3' - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index bf14715..0000000 --- a/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,32 +0,0 @@ -series: bionic - -machines: - '0': - '1': - '2': - '3': - -relations: - - ['keystone:shared-db', 'percona-cluster:shared-db'] - - ['hacluster:ha', 'keystone:ha'] - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - openstack-origin: cloud:bionic-ussuri - token-expiration: 60 - to: - - '1' - - '2' - - '3' - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index 5378192..0000000 --- a/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,54 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: focal - -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - -applications: - - keystone-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: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - token-expiration: 60 - openstack-origin: *openstack-origin - to: - - '3' - - '4' - - '5' - - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'hacluster:ha' - - 'keystone:ha' - - - "keystone-mysql-router:db-router" - - "mysql-innodb-cluster:db-router" diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml deleted file mode 100644 index a333fb2..0000000 --- a/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,54 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: focal - -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - -applications: - - keystone-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: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - token-expiration: 60 - openstack-origin: *openstack-origin - to: - - '3' - - '4' - - '5' - - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'hacluster:ha' - - 'keystone:ha' - - - "keystone-mysql-router:db-router" - - "mysql-innodb-cluster:db-router" diff --git a/tests/bundles/focal-wallaby.yaml b/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index 2339b18..0000000 --- a/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,54 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: focal - -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - -applications: - - keystone-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: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - token-expiration: 60 - openstack-origin: *openstack-origin - to: - - '3' - - '4' - - '5' - - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'hacluster:ha' - - 'keystone:ha' - - - "keystone-mysql-router:db-router" - - "mysql-innodb-cluster:db-router" diff --git a/tests/bundles/focal-xena.yaml b/tests/bundles/focal-xena.yaml index 6a31bcc..c5e96f9 100644 --- a/tests/bundles/focal-xena.yaml +++ b/tests/bundles/focal-xena.yaml @@ -17,10 +17,11 @@ machines: applications: keystone-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 @@ -28,9 +29,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 3 options: token-expiration: 60 @@ -39,6 +41,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge hacluster: charm: ../../../hacluster diff --git a/tests/bundles/focal-yoga.yaml b/tests/bundles/focal-yoga.yaml index 8e48eba..8b95788 100644 --- a/tests/bundles/focal-yoga.yaml +++ b/tests/bundles/focal-yoga.yaml @@ -17,10 +17,11 @@ machines: applications: keystone-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 @@ -28,9 +29,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 3 options: token-expiration: 60 @@ -39,6 +41,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge hacluster: charm: ../../../hacluster diff --git a/tests/bundles/hirsute-wallaby.yaml b/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 869c6da..0000000 --- a/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,54 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: hirsute - -machines: - '0': - constraints: mem=3072M - '1': - constraints: mem=3072M - '2': - constraints: mem=3072M - '3': - '4': - '5': - -applications: - - keystone-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: - charm: cs:~openstack-charmers-next/keystone - num_units: 3 - options: - token-expiration: 60 - openstack-origin: *openstack-origin - to: - - '3' - - '4' - - '5' - - hacluster: - charm: ../../../hacluster - subordinate-to: - - keystone - -relations: - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'hacluster:ha' - - 'keystone:ha' - - - "keystone-mysql-router:db-router" - - "mysql-innodb-cluster:db-router" diff --git a/tests/bundles/impish-xena.yaml b/tests/bundles/impish-xena.yaml index 23cc10b..689eee0 100644 --- a/tests/bundles/impish-xena.yaml +++ b/tests/bundles/impish-xena.yaml @@ -17,10 +17,11 @@ machines: applications: keystone-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 @@ -28,9 +29,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 3 options: token-expiration: 60 @@ -39,6 +41,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge hacluster: charm: ../../../hacluster diff --git a/tests/bundles/jammy-yoga.yaml b/tests/bundles/jammy-yoga.yaml index 4b8545b..ee42519 100644 --- a/tests/bundles/jammy-yoga.yaml +++ b/tests/bundles/jammy-yoga.yaml @@ -17,10 +17,11 @@ machines: applications: keystone-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 @@ -28,9 +29,10 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 3 options: token-expiration: 60 @@ -39,6 +41,7 @@ applications: - '3' - '4' - '5' + channel: latest/edge hacluster: charm: ../../../hacluster diff --git a/tests/tests.yaml b/tests/tests.yaml index 6a2c836..4e46dee 100644 --- a/tests/tests.yaml +++ b/tests/tests.yaml @@ -1,22 +1,13 @@ charm_name: hacluster smoke_bundles: - - focal-ussuri + - focal-xena gate_bundles: - - bionic-queens - - bionic-stein - - bionic-ussuri - - focal-ussuri - - focal-victoria - - focal-wallaby - focal-xena - - hirsute-wallaby - impish-xena dev_bundles: - - bionic-rocky - - bionic-train - focal-yoga - jammy-yoga @@ -32,6 +23,5 @@ tests_options: principle-app-name: keystone hacluster-charm-name: hacluster force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga