From e30fd73ac5237279055359c6abc7825444d9b111 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Fri, 17 Jun 2022 15:35:30 +0100
Subject: [PATCH] Update the bundles to use the stable track, edge risk for
 victoria

This update points the charms to the appropriate channel for
the charm being used, either from ceph, openstack, ovn or the
misc tracks for victoria.

Change-Id: I1217cca025fef1280d2012a2ded2bb9d3ec46290
---
 test-requirements.txt             | 2 +-
 tests/bundles/focal-ussuri.yaml   | 6 +++---
 tests/bundles/focal-victoria.yaml | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 451e49e6..8fc09107 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -43,7 +43,7 @@ git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/victor
 
 # Needed for charm-glance:
 git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
-tempest<31.0.0;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
diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml
index 60fca94c..9eb97ab6 100644
--- a/tests/bundles/focal-ussuri.yaml
+++ b/tests/bundles/focal-ussuri.yaml
@@ -25,10 +25,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   openstack-dashboard-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -39,7 +39,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   keystone:
     charm: ch:keystone
diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml
index 789d2677..149c5a32 100644
--- a/tests/bundles/focal-victoria.yaml
+++ b/tests/bundles/focal-victoria.yaml
@@ -25,10 +25,10 @@ applications:
 
   keystone-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
   openstack-dashboard-mysql-router:
     charm: ch:mysql-router
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   mysql-innodb-cluster:
     charm: ch:mysql-innodb-cluster
@@ -39,7 +39,7 @@ applications:
       - '0'
       - '1'
       - '2'
-    channel: 8.0.19/stable
+    channel: 8.0/edge
 
   keystone:
     charm: ch:keystone