Add Groovy test bundles

Closes-Bug: #1885935
Change-Id: Iac4ec3a98c66164d3d6e254ebe41e46e4e8ba5df

src/tests/bundles/groovy-full-ha.yaml

@@ -0,0 +1 @@
+groovy-full.yaml

src/tests/bundles/groovy-full.yaml

@@ -0,0 +1,161 @@
+variables:
+  openstack-origin: &openstack-origin distro-proposed
+
+series: &series groovy
+
+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: bionic
+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

src/tests/bundles/groovy.yaml

@@ -0,0 +1,29 @@
+series: groovy
+applications:
+  keystone-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  vault-mysql-router:
+    charm: cs:~openstack-charmers-next/mysql-router
+  mysql-innodb-cluster:
+    series: groovy
+    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

src/tests/bundles/overlays/groovy-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"]

src/tests/tests.yaml

@@ -2,7 +2,7 @@ charm_name: mysql-innodb-cluster
 configure:
 - zaza.openstack.charm_tests.vault.setup.auto_initialize
 - zaza.openstack.charm_tests.keystone.setup.add_demo_user
-- focal_full_model:
+- full_model:
     - zaza.openstack.charm_tests.vault.setup.auto_initialize
     - zaza.openstack.charm_tests.glance.setup.add_lts_image
     - zaza.openstack.charm_tests.neutron.setup.basic_overcloud_network
@@ -15,7 +15,7 @@ configure:
 tests:
 - zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterTests
 - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
-- focal_full_model:
+- full_model:
     - zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterTests
     - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
 - scale_in_out:
@@ -23,15 +23,17 @@ tests:
     - zaza.openstack.charm_tests.mysql.tests.MySQLInnoDBClusterScaleTest
     - zaza.openstack.charm_tests.keystone.tests.AuthenticationAuthorizationTest
 dev_bundles:
+- scale_in_out: groovy
+- full_model: groovy-full-ha
 gate_bundles:
 - scale_in_out: focal
-- focal_full_model: focal-full-ha
+- full_model: focal-full-ha
 smoke_bundles:
 - focal
 tests_options:
   force_deploy:
-   - focal
-   - focal-full-ha
+   - groovy
+   - groovy-full-ha
 target_deploy_status:
   neutron-api-plugin-ovn:
     workload-status: waiting