From 57b02930bde95fe591805c34acf628cdf7045c76 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 27 Sep 2021 14:52:40 +0100 Subject: [PATCH] Add impish bundles - add non-voting impish bundles - fix series bugs in hirsute bundles - rebuild to pick up charm-helpers changes - update tox/pip.sh to ensure setuptools<50.0.0 - remove groovy bundle Change-Id: Ibf7ef38a3b8864f58157da88787183c677a59733 --- osci.yaml | 9 +- rebuild | 2 +- src/tests/bundles/hirsute-full.yaml | 2 +- src/tests/bundles/hirsute.yaml | 1 - src/tests/bundles/impish-full-ha.yaml | 1 + src/tests/bundles/impish-full.yaml | 161 ++++++++++++++++++ src/tests/bundles/impish.yaml | 28 +++ .../bundles/overlays/impish-full-ha.yaml.j2 | 16 ++ src/tests/tests.yaml | 12 +- 9 files changed, 224 insertions(+), 8 deletions(-) create mode 120000 src/tests/bundles/impish-full-ha.yaml create mode 100644 src/tests/bundles/impish-full.yaml create mode 100644 src/tests/bundles/impish.yaml create mode 100644 src/tests/bundles/overlays/impish-full-ha.yaml.j2 diff --git a/osci.yaml b/osci.yaml index f746b2e..4baf0ed 100644 --- a/osci.yaml +++ b/osci.yaml @@ -5,8 +5,9 @@ jobs: - focal - full_model-focal-full-ha - - full_model-groovy-full-ha - full_model-hirsute-full-ha + - full_model-impish-full-ha: + voting: false vars: needs_charm_build: true charm_build_name: mysql-innodb-cluster @@ -30,3 +31,9 @@ dependencies: *smoke-jobs vars: tox_extra_args: full_model:hirsute-full-ha +- job: + name: full_model-impish-full-ha + parent: func-target + dependencies: *smoke-jobs + vars: + tox_extra_args: full_model:impish-full-ha diff --git a/rebuild b/rebuild index 4ce65ca..fdd5347 100644 --- a/rebuild +++ b/rebuild @@ -2,4 +2,4 @@ # when dependencies of the charm change, # but nothing in the charm needs to. # simply change the uuid to something new -fa1e5078-b3eb-11eb-bc5d-6f38fa731980 +53d6f0a4-1178-11ec-8669-2b164e53ebfb diff --git a/src/tests/bundles/hirsute-full.yaml b/src/tests/bundles/hirsute-full.yaml index cfc3300..5e38d24 100644 --- a/src/tests/bundles/hirsute-full.yaml +++ b/src/tests/bundles/hirsute-full.yaml @@ -79,7 +79,7 @@ applications: memcached: charm: cs:memcached num_units: 1 - series: bionic + series: focal relations: - - neutron-api:amqp - rabbitmq-server:amqp diff --git a/src/tests/bundles/hirsute.yaml b/src/tests/bundles/hirsute.yaml index e8d883c..eb43080 100644 --- a/src/tests/bundles/hirsute.yaml +++ b/src/tests/bundles/hirsute.yaml @@ -5,7 +5,6 @@ applications: vault-mysql-router: charm: cs:~openstack-charmers-next/mysql-router mysql-innodb-cluster: - series: groovy charm: ../../../mysql-innodb-cluster num_units: 3 keystone: diff --git a/src/tests/bundles/impish-full-ha.yaml b/src/tests/bundles/impish-full-ha.yaml new file mode 120000 index 0000000..e135644 --- /dev/null +++ b/src/tests/bundles/impish-full-ha.yaml @@ -0,0 +1 @@ +impish-full.yaml \ No newline at end of file diff --git a/src/tests/bundles/impish-full.yaml b/src/tests/bundles/impish-full.yaml new file mode 100644 index 0000000..673d954 --- /dev/null +++ b/src/tests/bundles/impish-full.yaml @@ -0,0 +1,161 @@ +variables: + openstack-origin: &openstack-origin distro + +series: &series impish + +applications: + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + nova-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + glance-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + neutron-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + placement-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + charm: ../../../mysql-innodb-cluster + num_units: 3 + options: + source: *openstack-origin + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + options: + openstack-origin: *openstack-origin + rabbitmq-server: + charm: cs:~openstack-charmers-next/rabbitmq-server + num_units: 1 + options: + source: *openstack-origin + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 + ovn-central: + charm: cs:~openstack-charmers-next/ovn-central + num_units: 3 + options: + source: *openstack-origin + neutron-api-plugin-ovn: + charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + neutron-api: + charm: cs:~openstack-charmers-next/neutron-api + series: *series + num_units: 1 + options: + flat-network-providers: physnet1 + neutron-security-groups: true + openstack-origin: *openstack-origin + glance: + charm: cs:~openstack-charmers-next/glance + num_units: 1 + options: + openstack-origin: *openstack-origin + nova-cloud-controller: + charm: cs:~openstack-charmers-next/nova-cloud-controller + num_units: 1 + options: + network-manager: Neutron + openstack-origin: *openstack-origin + ovn-chassis: + charm: cs:~openstack-charmers-next/ovn-chassis + nova-compute: + charm: cs:~openstack-charmers-next/nova-compute + num_units: 1 + options: + config-flags: default_ephemeral_format=ext4 + enable-live-migration: true + enable-resize: true + migration-auth-type: ssh + openstack-origin: *openstack-origin + placement: + charm: cs:~openstack-charmers-next/placement + num_units: 1 + options: + openstack-origin: *openstack-origin + memcached: + charm: cs:memcached + num_units: 1 + series: focal +relations: + - - neutron-api:amqp + - rabbitmq-server:amqp + - - neutron-api:neutron-api + - nova-cloud-controller:neutron-api + - - neutron-api:identity-service + - keystone:identity-service + - - nova-cloud-controller:amqp + - rabbitmq-server:amqp + - - nova-compute:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:identity-service + - keystone:identity-service + - - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute + - - glance:identity-service + - keystone:identity-service + - - glance:amqp + - rabbitmq-server:amqp + - - nova-compute:image-service + - glance:image-service + - - nova-cloud-controller:image-service + - glance:image-service + - - placement:identity-service + - keystone:identity-service + - - placement:placement + - nova-cloud-controller:placement + - - neutron-api-plugin-ovn:neutron-plugin + - neutron-api:neutron-plugin-api-subordinate + - - ovn-central:certificates + - vault:certificates + - - ovn-central:ovsdb-cms + - neutron-api-plugin-ovn:ovsdb-cms + - - neutron-api:certificates + - vault:certificates + - - ovn-chassis:nova-compute + - nova-compute:neutron-plugin + - - ovn-chassis:certificates + - vault:certificates + - - ovn-chassis:ovsdb + - ovn-central:ovsdb + - - vault:certificates + - neutron-api-plugin-ovn:certificates + - - vault:certificates + - glance:certificates + - - vault:certificates + - keystone:certificates + - - vault:certificates + - nova-cloud-controller:certificates + - - vault:certificates + - placement:certificates + - - vault:certificates + - mysql-innodb-cluster:certificates + - - memcached:cache + - nova-cloud-controller:memcache + - - keystone:shared-db + - keystone-mysql-router:shared-db + - - glance:shared-db + - glance-mysql-router:shared-db + - - nova-cloud-controller:shared-db + - nova-mysql-router:shared-db + - - neutron-api:shared-db + - neutron-mysql-router:shared-db + - - placement:shared-db + - placement-mysql-router:shared-db + - - vault:shared-db + - vault-mysql-router:shared-db + - - keystone-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - nova-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - glance-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - neutron-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - placement-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - vault-mysql-router:db-router + - mysql-innodb-cluster:db-router diff --git a/src/tests/bundles/impish.yaml b/src/tests/bundles/impish.yaml new file mode 100644 index 0000000..3997ba1 --- /dev/null +++ b/src/tests/bundles/impish.yaml @@ -0,0 +1,28 @@ +series: impish +applications: + keystone-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + vault-mysql-router: + charm: cs:~openstack-charmers-next/mysql-router + mysql-innodb-cluster: + charm: ../../../mysql-innodb-cluster + num_units: 3 + keystone: + charm: cs:~openstack-charmers-next/keystone + num_units: 1 + vault: + charm: cs:~openstack-charmers-next/vault + num_units: 1 +relations: + - - vault:certificates + - mysql-innodb-cluster:certificates + - - vault:certificates + - keystone:certificates + - - keystone:shared-db + - keystone-mysql-router:shared-db + - - vault:shared-db + - vault-mysql-router:shared-db + - - keystone-mysql-router:db-router + - mysql-innodb-cluster:db-router + - - vault-mysql-router:db-router + - mysql-innodb-cluster:db-router diff --git a/src/tests/bundles/overlays/impish-full-ha.yaml.j2 b/src/tests/bundles/overlays/impish-full-ha.yaml.j2 new file mode 100644 index 0000000..2d8fd26 --- /dev/null +++ b/src/tests/bundles/overlays/impish-full-ha.yaml.j2 @@ -0,0 +1,16 @@ +applications: + keystone: + num_units: 3 + options: + vip: {{TEST_VIP00}} + nova-cloud-controller: + num_units: 3 + options: + vip: {{TEST_VIP01}} + keystone-hacluster: + charm: cs:~openstack-charmers-next/hacluster + nova-hacluster: + charm: cs:~openstack-charmers-next/hacluster +relations: +- ["keystone:ha", "keystone-hacluster:ha"] +- ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml index 9c8524d..4f176b5 100644 --- a/src/tests/tests.yaml +++ b/src/tests/tests.yaml @@ -28,20 +28,24 @@ tests: gate_bundles: - scale_in_out: focal - full_model: focal-full-ha -- scale_in_out: groovy -- full_model: groovy-full-ha smoke_bundles: - focal dev_bundles: +- scale_in_out: groovy +- full_model: groovy-full-ha - scale_in_out: hirsute - full_model: hirsute-full-ha +- scale_in_out: impish +- full_model: impish-full-ha tests_options: force_deploy: - - hirsute - - hirsute-full-ha + - groovy + - groovy-full-ha + - impish + - impish-full-ha target_deploy_status: neutron-api-plugin-ovn: