Updates for 20.08 cycle start for groovy and libs

- Adds groovy to the series in the metadata
- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild

Change-Id: Ia1eb56b1605a4c69b0e79a65dae55d20e02e458c

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
-c17ec0ce-937e-11ea-a49b-8b4b0c8e2b7f
+91eb09f4-a4d0-11ea-9a2e-e39fe2cdb222

src/metadata.yaml

@@ -4,11 +4,12 @@ maintainer: OpenStack Charmers <openstack-charmers@lists.ubuntu.com>
 description: |
   Tool for retrofitting cloud image for use as Octavia Amphora
 tags:
-  - openstack
+- openstack
 series:
-  - bionic
-  - eoan
-  - focal
+- bionic
+- eoan
+- focal
+- groovy
 subordinate: true
 requires:
   juju-info:

src/tests/bundles/bionic-rocky.yaml

@@ -10,10 +10,6 @@ relations:
   - glance:identity-service
 - - keystone:identity-service
   - glance-simplestreams-sync:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - rabbitmq-server:amqp
-  - glance-simplestreams-sync:amqp
 - - keystone:identity-credentials
   - octavia-diskimage-retrofit:identity-credentials
 applications:
@@ -26,9 +22,6 @@ applications:
     constraints: mem=3072M
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
   glance:
     charm: cs:~openstack-charmers-next/glance
     num_units: 1

src/tests/bundles/bionic-stein.yaml

@@ -10,10 +10,6 @@ relations:
   - glance:identity-service
 - - keystone:identity-service
   - glance-simplestreams-sync:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - rabbitmq-server:amqp
-  - glance-simplestreams-sync:amqp
 - - keystone:identity-credentials
   - octavia-diskimage-retrofit:identity-credentials
 applications:
@@ -26,9 +22,6 @@ applications:
     constraints: mem=3072M
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
   glance:
     charm: cs:~openstack-charmers-next/glance
     num_units: 1

src/tests/bundles/bionic-train.yaml

@@ -10,10 +10,6 @@ relations:
   - glance:identity-service
 - - keystone:identity-service
   - glance-simplestreams-sync:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - rabbitmq-server:amqp
-  - glance-simplestreams-sync:amqp
 - - keystone:identity-credentials
   - octavia-diskimage-retrofit:identity-credentials
 applications:
@@ -26,9 +22,6 @@ applications:
     constraints: mem=3072M
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
   glance:
     charm: cs:~openstack-charmers-next/glance
     num_units: 1

src/tests/bundles/bionic-ussuri.yaml

@@ -10,10 +10,6 @@ relations:
   - glance:identity-service
 - - keystone:identity-service
   - glance-simplestreams-sync:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - rabbitmq-server:amqp
-  - glance-simplestreams-sync:amqp
 - - keystone:identity-credentials
   - octavia-diskimage-retrofit:identity-credentials
 applications:
@@ -26,9 +22,6 @@ applications:
     constraints: mem=3072M
     charm: cs:~openstack-charmers-next/percona-cluster
     num_units: 1
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
   glance:
     charm: cs:~openstack-charmers-next/glance
     num_units: 1

src/tests/bundles/eoan.yaml

@@ -10,10 +10,6 @@ relations:
   - glance:identity-service
 - - keystone:identity-service
   - glance-simplestreams-sync:identity-service
-- - glance:amqp
-  - rabbitmq-server:amqp
-- - rabbitmq-server:amqp
-  - glance-simplestreams-sync:amqp
 - - keystone:identity-credentials
   - octavia-diskimage-retrofit:identity-credentials
 - - keystone-mysql-router:db-router
@@ -32,9 +28,6 @@ applications:
     constraints: mem=3072M
     charm: cs:~openstack-charmers-next/mysql-innodb-cluster
     num_units: 3
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
   glance-mysql-router:
     charm: cs:~openstack-charmers-next/mysql-router
   glance:

src/tests/bundles/focal-ussuri.yaml

@@ -15,7 +15,6 @@ machines:
   '3':
   '4':
   '5':
-  '6':
 
 applications:
 
@@ -43,21 +42,13 @@ applications:
     to:
       - '3'
 
-  rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-
   glance:
     charm: cs:~openstack-charmers-next/glance
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
-      - '5'
+      - '4'
 
   glance-simplestreams-sync:
     charm: cs:~openstack-charmers-next/glance-simplestreams-sync
@@ -86,7 +77,7 @@ applications:
                ]
           }]"
     to:
-      - '6'
+      - '5'
 
   octavia-diskimage-retrofit:
     charm: ../../../octavia-diskimage-retrofit
@@ -114,11 +105,5 @@ relations:
   - - 'keystone:identity-service'
     - 'glance-simplestreams-sync:identity-service'
 
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'rabbitmq-server:amqp'
-    - 'glance-simplestreams-sync:amqp'
-
   - - 'keystone:identity-credentials'
     - 'octavia-diskimage-retrofit:identity-credentials'

src/tests/tests.yaml

@@ -11,8 +11,10 @@ dev_bundles:
 - eoan
 target_deploy_status:
   glance-simplestreams-sync:
-    workload-status: active
-    workload-status-message: Sync completed
+    workload-status: unknown
+    workload-status-message: ""
+configure:
+- zaza.openstack.charm_tests.glance_simplestreams_sync.setup.sync_images
 tests:
 - zaza.openstack.charm_tests.octavia.diskimage_retrofit.tests.OctaviaDiskimageRetrofitTest
 tests_options: