From bbbfdf21f68347fd64acca684d7ef21bb5c58dca Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 27 Jan 2022 14:14:31 +0000 Subject: [PATCH] Migrate charm to charmhub latest/edge track Change-Id: I3437bb58b85ccedf047910c0bf783f56dd438bf6 --- charmcraft.yaml | 13 ++++++ metadata.yaml | 1 + osci.yaml | 10 ++--- src/metadata.yaml | 3 -- src/tests/bundles/bionic-queens.yaml | 32 ------------- src/tests/bundles/bionic-rocky.yaml | 34 -------------- src/tests/bundles/bionic-stein.yaml | 34 -------------- src/tests/bundles/bionic-train.yaml | 34 -------------- src/tests/bundles/bionic-ussuri.yaml | 34 -------------- src/tests/bundles/focal-ussuri.yaml | 62 -------------------------- src/tests/bundles/focal-victoria.yaml | 62 -------------------------- src/tests/bundles/focal-wallaby.yaml | 62 -------------------------- src/tests/bundles/focal-xena.yaml | 9 ++-- src/tests/bundles/focal-yoga.yaml | 9 ++-- src/tests/bundles/hirsute-wallaby.yaml | 62 -------------------------- src/tests/bundles/impish-xena.yaml | 9 ++-- src/tests/bundles/jammy-yoga.yaml | 9 ++-- src/tests/tests.yaml | 12 +---- 18 files changed, 42 insertions(+), 449 deletions(-) create mode 100644 charmcraft.yaml create mode 120000 metadata.yaml delete mode 100644 src/tests/bundles/bionic-queens.yaml delete mode 100644 src/tests/bundles/bionic-rocky.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/hirsute-wallaby.yaml 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 b55d9ce..a333654 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,13 +1,9 @@ - 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 vars: needs_charm_build: true charm_build_name: keystone-ldap diff --git a/src/metadata.yaml b/src/metadata.yaml index 646e016..f1463d4 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -11,10 +11,7 @@ tags: - ldap - identity series: -- bionic - focal -- groovy -- hirsute - impish provides: domain-backend: diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml deleted file mode 100644 index 2009d7d..0000000 --- a/src/tests/bundles/bionic-queens.yaml +++ /dev/null @@ -1,32 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - to: - - '1' - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - to: - - '2' - keystone-ldap: - charm: ../../../keystone-ldap - -relations: -- - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index ee8e366..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,34 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - to: - - '1' - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - to: - - '2' - keystone-ldap: - charm: ../../../keystone-ldap - -relations: -- - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index d9e1226..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,34 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - to: - - '1' - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - to: - - '2' - keystone-ldap: - charm: ../../../keystone-ldap - -relations: -- - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index 001f48d..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,34 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-train - to: - - '1' - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - to: - - '2' - keystone-ldap: - charm: ../../../keystone-ldap - -relations: -- - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index 3cef65c..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,34 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - -applications: - percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster - num_units: 1 - to: - - '0' - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - to: - - '1' - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - to: - - '2' - keystone-ldap: - charm: ../../../keystone-ldap - -relations: -- - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' -- - 'keystone:shared-db' - - 'percona-cluster:shared-db' diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index b962ce3..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,62 +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': - series: bionic - -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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - series: bionic - num_units: 1 - to: - - '4' - - keystone-ldap: - charm: ../../../keystone-ldap - -relations: - - - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' - - - - '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 3f1b3a8..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,62 +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': - series: bionic - -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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - series: bionic - to: - - '4' - - keystone-ldap: - charm: ../../../keystone-ldap - -relations: - - - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' - - - - '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 252cbb3..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,62 +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': - series: bionic - -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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - series: bionic - to: - - '4' - - keystone-ldap: - charm: ../../../keystone-ldap - -relations: - - - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' - - - - '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-xena.yaml b/src/tests/bundles/focal-xena.yaml index edf9a4f..b7bca6c 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -20,10 +20,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 @@ -33,14 +34,16 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge ldap-server: charm: cs:~openstack-charmers/ldap-test-fixture diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 8471380..3bef2de 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -20,10 +20,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 @@ -33,14 +34,16 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge ldap-server: charm: cs:~openstack-charmers/ldap-test-fixture diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 05f44e3..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,62 +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': - series: bionic - -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 - # Reduce chances of spurious "super-read-only" failures, see lp:1882205 - expel-timeout: 20 - to: - - '0' - - '1' - - '2' - - keystone: - charm: cs:~openstack-charmers-next/keystone - num_units: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - ldap-server: - charm: cs:~openstack-charmers/ldap-test-fixture - num_units: 1 - series: bionic - to: - - '4' - - keystone-ldap: - charm: ../../../keystone-ldap - -relations: - - - 'keystone:domain-backend' - - 'keystone-ldap:domain-backend' - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index d4c198f..3f52137 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -20,10 +20,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 @@ -33,14 +34,16 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge ldap-server: charm: cs:~openstack-charmers/ldap-test-fixture diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 1ede9fa..a216649 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -20,10 +20,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 @@ -33,14 +34,16 @@ applications: - '0' - '1' - '2' + channel: latest/edge keystone: - charm: cs:~openstack-charmers-next/keystone + charm: ch:keystone num_units: 1 options: openstack-origin: *openstack-origin to: - '3' + channel: latest/edge ldap-server: charm: cs:~openstack-charmers/ldap-test-fixture diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index b51c593..01a8655 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,22 +1,13 @@ charm_name: keystone-ldap 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 @@ -31,6 +22,5 @@ tests: tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga