commit 1bb00bb18832fcd4abe8a34dd16c20a8cf397738 Author: Frode Nordahl Date: Thu Oct 1 10:44:16 2020 +0200 Remove Eoan support as it is EOL Add focal-victoria and rename pre-existing bundles to follow a common naming-scheme. Switch to focal-ussuri as smoke target. Change-Id: Ifa9388f578df730e4aa37483cbc5cd30bf9d07d5 diff --git a/src/metadata.yaml b/src/metadata.yaml index 3d93e32..94c2020 100644 --- a/src/metadata.yaml +++ b/src/metadata.yaml @@ -8,7 +8,6 @@ tags: - networking series: - bionic -- eoan - focal - groovy subordinate: false diff --git a/src/tests/bundles/eoan.yaml b/src/tests/bundles/eoan.yaml deleted file mode 100644 index 5f0be91..0000000 --- a/src/tests/bundles/eoan.yaml +++ /dev/null @@ -1,31 +0,0 @@ -series: eoan -relations: -- - vault-mysql-router:db-router - - mysql-innodb-cluster:db-router -- - vault:shared-db - - vault-mysql-router:shared-db -- - ovn-central:certificates - - vault:certificates -- - ovn-dedicated-chassis:ovsdb - - ovn-central:ovsdb -- - ovn-dedicated-chassis:certificates - - vault:certificates -applications: - mysql-innodb-cluster: - charm: cs:~openstack-charmers-next/mysql-innodb-cluster - num_units: 3 - vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: distro - ovn-dedicated-chassis: - charm: cs:~openstack-charmers-next/ovn-dedicated-chassis - num_units: 2 - options: - source: distro diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml new file mode 100644 index 0000000..a9466c3 --- /dev/null +++ b/src/tests/bundles/focal-ussuri.yaml @@ -0,0 +1,74 @@ +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': + '7': + '8': + +applications: + + vault-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' + + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + to: + - '3' + + ovn-central: + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + to: + - '4' + - '5' + - '6' + + + ovn-dedicated-chassis: + charm: cs:~openstack-charmers-next/ovn-dedicated-chassis + num_units: 2 + options: + source: *openstack-origin + to: + - '7' + - '8' + +relations: + + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'ovn-central:certificates' + - 'vault:certificates' + - - 'ovn-dedicated-chassis:ovsdb' + - 'ovn-central:ovsdb' + - - 'ovn-dedicated-chassis:certificates' + - 'vault:certificates' diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml new file mode 100644 index 0000000..257e95a --- /dev/null +++ b/src/tests/bundles/focal-victoria.yaml @@ -0,0 +1,74 @@ +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': + '7': + '8': + +applications: + + vault-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' + + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + to: + - '3' + + ovn-central: + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + to: + - '4' + - '5' + - '6' + + + ovn-dedicated-chassis: + charm: cs:~openstack-charmers-next/ovn-dedicated-chassis + num_units: 2 + options: + source: *openstack-origin + to: + - '7' + - '8' + +relations: + + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'ovn-central:certificates' + - 'vault:certificates' + - - 'ovn-dedicated-chassis:ovsdb' + - 'ovn-central:ovsdb' + - - 'ovn-dedicated-chassis:certificates' + - 'vault:certificates' diff --git a/src/tests/bundles/focal.yaml b/src/tests/bundles/focal.yaml deleted file mode 100644 index a9466c3..0000000 --- a/src/tests/bundles/focal.yaml +++ /dev/null @@ -1,74 +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': - '7': - '8': - -applications: - - vault-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' - - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '3' - - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - to: - - '4' - - '5' - - '6' - - - ovn-dedicated-chassis: - charm: cs:~openstack-charmers-next/ovn-dedicated-chassis - num_units: 2 - options: - source: *openstack-origin - to: - - '7' - - '8' - -relations: - - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'ovn-central:certificates' - - 'vault:certificates' - - - 'ovn-dedicated-chassis:ovsdb' - - 'ovn-central:ovsdb' - - - 'ovn-dedicated-chassis:certificates' - - 'vault:certificates' diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml new file mode 100644 index 0000000..19dcb82 --- /dev/null +++ b/src/tests/bundles/groovy-victoria.yaml @@ -0,0 +1,74 @@ +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': + '6': + '7': + '8': + +applications: + + vault-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' + + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + to: + - '3' + + ovn-central: + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + to: + - '4' + - '5' + - '6' + + + ovn-dedicated-chassis: + charm: cs:~openstack-charmers-next/ovn-dedicated-chassis + num_units: 2 + options: + source: *openstack-origin + to: + - '7' + - '8' + +relations: + + - - 'vault-mysql-router:db-router' + - 'mysql-innodb-cluster:db-router' + - - 'vault:shared-db' + - 'vault-mysql-router:shared-db' + - - 'ovn-central:certificates' + - 'vault:certificates' + - - 'ovn-dedicated-chassis:ovsdb' + - 'ovn-central:ovsdb' + - - 'ovn-dedicated-chassis:certificates' + - 'vault:certificates' diff --git a/src/tests/bundles/groovy.yaml b/src/tests/bundles/groovy.yaml deleted file mode 100644 index 19dcb82..0000000 --- a/src/tests/bundles/groovy.yaml +++ /dev/null @@ -1,74 +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': - '6': - '7': - '8': - -applications: - - vault-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' - - vault: - charm: cs:~openstack-charmers-next/vault - num_units: 1 - to: - - '3' - - ovn-central: - charm: cs:~openstack-charmers-next/ovn-central - num_units: 3 - options: - source: *openstack-origin - to: - - '4' - - '5' - - '6' - - - ovn-dedicated-chassis: - charm: cs:~openstack-charmers-next/ovn-dedicated-chassis - num_units: 2 - options: - source: *openstack-origin - to: - - '7' - - '8' - -relations: - - - - 'vault-mysql-router:db-router' - - 'mysql-innodb-cluster:db-router' - - - 'vault:shared-db' - - 'vault-mysql-router:shared-db' - - - 'ovn-central:certificates' - - 'vault:certificates' - - - 'ovn-dedicated-chassis:ovsdb' - - 'ovn-central:ovsdb' - - - 'ovn-dedicated-chassis:certificates' - - 'vault:certificates' diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 4d678aa..cfbcd0d 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -1,13 +1,13 @@ charm_name: ovn-dedicated-chassis gate_bundles: - bionic-train -- eoan -- focal - bionic-ussuri +- focal-ussuri +- focal-victoria smoke_bundles: -- bionic-ussuri +- focal-ussuri dev_bundles: -- groovy +- groovy-victoria target_deploy_status: ovn-central: workload-status: waiting @@ -24,4 +24,4 @@ tests: - zaza.openstack.charm_tests.ovn.tests.ChassisCharmOperationTest tests_options: force_deploy: - - groovy + - groovy-victoria