Update the bundles to use the stable track, edge risk for yoga

The bundles for the yoga channel currently point to "latest/edge"
channel for all the charms.  This update points the charms to the
appropriate channel for the charm being used, either from ceph,
openstack, ovn or the misc tracks.

Remove impish bundle as EOL.
Make yoga jobs voting as this branch needs to support yoga on focal and
jammy.

Change-Id: I1c9d3877279e68a1506788f3786da558d0b403fd

osci.yaml

@@ -5,12 +5,8 @@
     check:
       jobs:
         - test-s3api-focal-xena
-        - test-s3api-focal-yoga:
+        - test-s3api-focal-yoga
-            voting: false
+        - test-s3api-jammy-yoga
-        - test-s3api-impish-xena:
-            voting: false
-        - test-s3api-jammy-yoga:
-            voting: false
     vars:
       needs_charm_build: true
       charm_build_name: swift-proxy
@@ -34,13 +30,6 @@
       - test-s3api-focal-xena
     vars:
       tox_extra_args: test-s3api:focal-yoga
-- job:
-    name: test-s3api-impish-xena
-    parent: func-target
-    dependencies:
-      - test-s3api-focal-xena
-    vars:
-      tox_extra_args: test-s3api:impish-xena
 - job:
     name: test-s3api-jammy-yoga
     parent: func-target

test-requirements.txt

@@ -37,7 +37,8 @@ git+https://github.com/openstack-charmers/zaza.git@stable/yoga#egg=zaza
 git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack
 
 # Needed for charm-glance:
-git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'
+git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
+tempest<31.0.0;python_version<'3.8' and python_version>='3.6'
 tempest<24.0.0;python_version<'3.6'
 
 croniter            # needed for charm-rabbitmq-server unit tests

tests/bundles/focal-xena.yaml

@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin cloud:focal-xena
 
@@ -21,10 +23,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -35,7 +37,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: latest/edge
+    channel: 8.0/edge
 
   keystone:
     expose: True

tests/bundles/focal-yoga.yaml

@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin cloud:focal-yoga
 
@@ -21,10 +23,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -35,7 +37,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: latest/edge
+    channel: 8.0/edge
 
   keystone:
     expose: True

tests/bundles/impish-xena.yaml

@@ -1,105 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin distro
-
-series: impish
-
-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':
-
-applications:
-
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  keystone:
-    expose: True
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-    channel: yoga/edge
-
-  swift-proxy:
-    charm: ../../swift-proxy.charm
-    num_units: 1
-    options:
-      zone-assignment: manual
-      replicas: 1
-      swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
-      openstack-origin: *openstack-origin
-    to:
-      - '4'
-
-  glance:
-    expose: True
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-    channel: yoga/edge
-
-  swift-storage:
-    charm: ch:swift-storage
-    num_units: 1
-    storage:
-      block-devices: 'cinder,2G,2'
-    options:
-      zone: 1
-      openstack-origin: *openstack-origin
-    to:
-      - '6'
-    channel: yoga/edge
-
-relations:
-
-  - - 'keystone:shared-db'
-    - 'keystone-mysql-router:shared-db'
-  - - 'keystone-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:shared-db'
-    - 'glance-mysql-router:shared-db'
-  - - 'glance-mysql-router:db-router'
-    - 'mysql-innodb-cluster:db-router'
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'swift-proxy:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'swift-storage:swift-storage'
-    - 'swift-proxy:swift-storage'
-
-  - - 'glance:object-store'
-    - 'swift-proxy:object-store'

tests/bundles/jammy-yoga.yaml

@@ -1,3 +1,5 @@
+local_overlay_enabled: False
+
 variables:
   openstack-origin: &openstack-origin distro
 
@@ -21,10 +23,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
   glance-mysql-router:
     charm: ch:mysql-router
-    channel: latest/edge
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -35,7 +37,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: latest/edge
+    channel: 8.0/edge
 
   keystone:
     expose: True

tests/tests.yaml

@@ -2,15 +2,14 @@ charm_name: swift-proxy
 
 gate_bundles:
   - test-s3api: focal-xena
-  - test-s3api: impish-xena
-
-dev_bundles:
   - test-s3api: focal-yoga
   - test-s3api: jammy-yoga
 
+dev_bundles: []
+
 smoke_bundles:
   # Use no s3api test for smoke
-  - focal-xena
+  - focal-yoga
 
 configure:
   - swift_gr_region1:
@@ -29,7 +28,6 @@ tests:
 
 tests_options:
   force_deploy:
-    - impish-xena
     - jammy-yoga
   policyd:
     - service: swift