From 2021e2c518187cbd293e5769f9d6fbed4b8a2e21 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Tue, 25 Jan 2022 15:41:23 +0000 Subject: [PATCH] Migration charm to charmhub latest/edge track Change-Id: I3860f8c83cc4ab37c429d7a44f0b8d292078b657 --- charmcraft.yaml | 13 +++++ metadata.yaml | 1 + osci.yaml | 9 ++-- src/config.yaml | 2 + src/metadata.yaml | 3 -- src/tests/bundles/bionic-rocky.yaml | 50 ----------------- src/tests/bundles/bionic-stein.yaml | 50 ----------------- src/tests/bundles/bionic-train.yaml | 50 ----------------- src/tests/bundles/bionic-ussuri.yaml | 50 ----------------- src/tests/bundles/focal-ussuri.yaml | 74 -------------------------- src/tests/bundles/focal-victoria.yaml | 74 -------------------------- src/tests/bundles/focal-wallaby.yaml | 74 -------------------------- src/tests/bundles/focal-xena.yaml | 15 ++++-- src/tests/bundles/focal-yoga.yaml | 15 ++++-- src/tests/bundles/hirsute-wallaby.yaml | 74 -------------------------- src/tests/bundles/impish-xena.yaml | 15 ++++-- src/tests/bundles/jammy-yoga.yaml | 15 ++++-- src/tests/tests.yaml | 13 +---- 18 files changed, 61 insertions(+), 536 deletions(-) create mode 100644 charmcraft.yaml create mode 120000 metadata.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 ca0f0ae..a5acd15 100644 --- a/osci.yaml +++ b/osci.yaml @@ -1,12 +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-yoga-functional-jobs vars: needs_charm_build: true charm_build_name: barbican diff --git a/src/config.yaml b/src/config.yaml index 6c0fefe..107cc47 100644 --- a/src/config.yaml +++ b/src/config.yaml @@ -44,3 +44,5 @@ options: type: int description: | Maximum allowed http request size against the barbican-api. + openstack-origin: + default: yoga diff --git a/src/metadata.yaml b/src/metadata.yaml index 4167a2b..741de01 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -8,10 +8,7 @@ description: | tags: - openstack series: -- bionic - focal -- groovy -- hirsute - impish subordinate: false requires: diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml deleted file mode 100644 index 2e79490..0000000 --- a/src/tests/bundles/bionic-rocky.yaml +++ /dev/null @@ -1,50 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - -applications: - - mysql: - 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' - - barbican: - series: bionic - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: cloud:bionic-rocky - debug: true - to: - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '3' - -relations: -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - barbican:shared-db -- - keystone:identity-service - - barbican:identity-service -- - rabbitmq-server:amqp - - barbican:amqp diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml deleted file mode 100644 index d869251..0000000 --- a/src/tests/bundles/bionic-stein.yaml +++ /dev/null @@ -1,50 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - -applications: - - mysql: - 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' - - barbican: - series: bionic - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: cloud:bionic-stein - debug: true - to: - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '3' - -relations: -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - barbican:shared-db -- - keystone:identity-service - - barbican:identity-service -- - rabbitmq-server:amqp - - barbican:amqp diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml deleted file mode 100644 index dd930de..0000000 --- a/src/tests/bundles/bionic-train.yaml +++ /dev/null @@ -1,50 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - -applications: - - mysql: - 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' - - barbican: - series: bionic - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: cloud:bionic-train - debug: true - to: - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '3' - -relations: -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - barbican:shared-db -- - keystone:identity-service - - barbican:identity-service -- - rabbitmq-server:amqp - - barbican:amqp diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml deleted file mode 100644 index d8af834..0000000 --- a/src/tests/bundles/bionic-ussuri.yaml +++ /dev/null @@ -1,50 +0,0 @@ -series: bionic - -machines: - '0': - constraints: mem=3072M - '1': - '2': - '3': - -applications: - - mysql: - 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' - - barbican: - series: bionic - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: cloud:bionic-ussuri - debug: true - to: - - '2' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '3' - -relations: -- - mysql:shared-db - - keystone:shared-db -- - mysql:shared-db - - barbican:shared-db -- - keystone:identity-service - - barbican:identity-service -- - rabbitmq-server:amqp - - barbican:amqp diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml deleted file mode 100644 index ad93fc6..0000000 --- a/src/tests/bundles/focal-ussuri.yaml +++ /dev/null @@ -1,74 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &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 - barbican-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: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - series: *series - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - to: - - '4' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '5' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml deleted file mode 100644 index 3e0ae93..0000000 --- a/src/tests/bundles/focal-victoria.yaml +++ /dev/null @@ -1,74 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-victoria - -series: &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 - barbican-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: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - series: *series - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - to: - - '4' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '5' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' diff --git a/src/tests/bundles/focal-wallaby.yaml b/src/tests/bundles/focal-wallaby.yaml deleted file mode 100644 index b62eec9..0000000 --- a/src/tests/bundles/focal-wallaby.yaml +++ /dev/null @@ -1,74 +0,0 @@ -variables: - openstack-origin: &openstack-origin cloud:focal-wallaby - -series: &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 - barbican-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: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - series: *series - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - to: - - '4' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '5' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' diff --git a/src/tests/bundles/focal-xena.yaml b/src/tests/bundles/focal-xena.yaml index a3aca08..7c0fde5 100644 --- a/src/tests/bundles/focal-xena.yaml +++ b/src/tests/bundles/focal-xena.yaml @@ -17,12 +17,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-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 @@ -30,14 +32,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 barbican: series: *series @@ -50,10 +54,11 @@ applications: - '4' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '5' + channel: latest/edge relations: diff --git a/src/tests/bundles/focal-yoga.yaml b/src/tests/bundles/focal-yoga.yaml index 02c6749..02c4506 100644 --- a/src/tests/bundles/focal-yoga.yaml +++ b/src/tests/bundles/focal-yoga.yaml @@ -17,12 +17,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-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 @@ -30,14 +32,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 barbican: series: *series @@ -50,10 +54,11 @@ applications: - '4' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '5' + channel: latest/edge relations: diff --git a/src/tests/bundles/hirsute-wallaby.yaml b/src/tests/bundles/hirsute-wallaby.yaml deleted file mode 100644 index 5ec8ebf..0000000 --- a/src/tests/bundles/hirsute-wallaby.yaml +++ /dev/null @@ -1,74 +0,0 @@ -variables: - openstack-origin: &openstack-origin distro - -series: &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 - barbican-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: 1 - options: - openstack-origin: *openstack-origin - to: - - '3' - - barbican: - series: *series - charm: ../../../barbican - num_units: 1 - options: - openstack-origin: *openstack-origin - debug: true - to: - - '4' - - rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server - num_units: 1 - to: - - '5' - -relations: - - - - 'keystone:shared-db' - - 'keystone-mysql-router:shared-db' - - - 'keystone-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'barbican:shared-db' - - 'barbican-mysql-router:shared-db' - - - 'barbican-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - - 'keystone:identity-service' - - 'barbican:identity-service' - - - - 'rabbitmq-server:amqp' - - 'barbican:amqp' diff --git a/src/tests/bundles/impish-xena.yaml b/src/tests/bundles/impish-xena.yaml index 28b931e..1a0237d 100644 --- a/src/tests/bundles/impish-xena.yaml +++ b/src/tests/bundles/impish-xena.yaml @@ -17,12 +17,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-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 @@ -30,14 +32,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 barbican: series: *series @@ -50,10 +54,11 @@ applications: - '4' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '5' + channel: latest/edge relations: diff --git a/src/tests/bundles/jammy-yoga.yaml b/src/tests/bundles/jammy-yoga.yaml index 0892211..a5fd817 100644 --- a/src/tests/bundles/jammy-yoga.yaml +++ b/src/tests/bundles/jammy-yoga.yaml @@ -17,12 +17,14 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: ch:mysql-router + channel: latest/edge barbican-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 @@ -30,14 +32,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 barbican: series: *series @@ -50,10 +54,11 @@ applications: - '4' rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: ch:rabbitmq-server num_units: 1 to: - '5' + channel: latest/edge relations: diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 51dafde..ce31a14 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,24 +1,15 @@ charm_name: barbican smoke_bundles: -- focal-ussuri -gate_bundles: -- bionic-stein -- bionic-ussuri -- focal-ussuri -- focal-victoria -- focal-wallaby - focal-xena -- hirsute-wallaby +gate_bundles: +- focal-xena - impish-xena dev_bundles: -- bionic-rocky -- bionic-train - focal-yoga - jammy-yoga tests: - zaza.openstack.charm_tests.barbican.tests.BarbicanTest tests_options: force_deploy: - - hirsute-wallaby - impish-xena - jammy-yoga