From e299dba50be25af4c4cba5b8d9bf4dacf5d89f64 Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Wed, 10 Feb 2021 19:57:15 +0100
Subject: [PATCH] Updates for stable branch creation 21.01

Set default branch for git review/gerrit.
Switch tests to stable.
Switch to using stable charm-helpers branch.
Switch to using stable charm.openstack branch.
Switch to using stable zaza branch.
Switch to using stable zaza-openstack-tests branch.

Change-Id: Ic2a78d1965026a8b7e06012203c04850b303ca23
---
 .gitreview                             |  2 ++
 src/test-requirements.txt              |  4 ++--
 src/tests/bundles/bionic-queens.yaml   | 14 +++++++-------
 src/tests/bundles/bionic-rocky.yaml    | 14 +++++++-------
 src/tests/bundles/bionic-stein.yaml    | 14 +++++++-------
 src/tests/bundles/bionic-train.yaml    | 14 +++++++-------
 src/tests/bundles/bionic-ussuri.yaml   | 14 +++++++-------
 src/tests/bundles/focal-ussuri.yaml    | 20 ++++++++++----------
 src/tests/bundles/focal-victoria.yaml  | 20 ++++++++++----------
 src/tests/bundles/groovy-victoria.yaml | 20 ++++++++++----------
 src/tests/bundles/trusty-mitaka.yaml   |  6 +++---
 src/tests/bundles/xenial-mitaka.yaml   |  8 ++++----
 src/tests/bundles/xenial-ocata.yaml    | 14 +++++++-------
 src/tests/bundles/xenial-pike.yaml     | 14 +++++++-------
 src/tests/bundles/xenial-queens.yaml   | 14 +++++++-------
 src/wheelhouse.txt                     |  4 ++--
 test-requirements.txt                  |  2 +-
 17 files changed, 100 insertions(+), 98 deletions(-)

diff --git a/.gitreview b/.gitreview
index 4f976b4..ea0c1ae 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-aodh.git
+
+defaultbranch=stable/21.01
diff --git a/src/test-requirements.txt b/src/test-requirements.txt
index 520681e..cf7632c 100644
--- a/src/test-requirements.txt
+++ b/src/test-requirements.txt
@@ -11,5 +11,5 @@ charm-tools>=2.4.4
 keyring<21
 
 # Functional Test Requirements (let Zaza's dependencies solve all dependencies here!)
-git+https://github.com/openstack-charmers/zaza.git#egg=zaza
-git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
+git+https://github.com/openstack-charmers/zaza.git@stable/21.01#egg=zaza
+git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.01#egg=zaza.openstack
diff --git a/src/tests/bundles/bionic-queens.yaml b/src/tests/bundles/bionic-queens.yaml
index 2f1f528..d62352c 100644
--- a/src/tests/bundles/bionic-queens.yaml
+++ b/src/tests/bundles/bionic-queens.yaml
@@ -23,7 +23,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -38,28 +38,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -70,7 +70,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -81,7 +81,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-rocky.yaml b/src/tests/bundles/bionic-rocky.yaml
index cd15c78..36053f2 100644
--- a/src/tests/bundles/bionic-rocky.yaml
+++ b/src/tests/bundles/bionic-rocky.yaml
@@ -23,7 +23,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -38,28 +38,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -70,7 +70,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -81,7 +81,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-stein.yaml b/src/tests/bundles/bionic-stein.yaml
index cf41938..fa9bbfb 100644
--- a/src/tests/bundles/bionic-stein.yaml
+++ b/src/tests/bundles/bionic-stein.yaml
@@ -23,7 +23,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -38,28 +38,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -70,7 +70,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -81,7 +81,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-train.yaml b/src/tests/bundles/bionic-train.yaml
index f2a2a85..f28c34d 100644
--- a/src/tests/bundles/bionic-train.yaml
+++ b/src/tests/bundles/bionic-train.yaml
@@ -23,7 +23,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -38,28 +38,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -70,7 +70,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -81,7 +81,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/bionic-ussuri.yaml b/src/tests/bundles/bionic-ussuri.yaml
index 9ec82d1..343288b 100644
--- a/src/tests/bundles/bionic-ussuri.yaml
+++ b/src/tests/bundles/bionic-ussuri.yaml
@@ -23,7 +23,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -38,28 +38,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -70,7 +70,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -81,7 +81,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
index 20a74aa..4b3aba3 100644
--- a/src/tests/bundles/focal-ussuri.yaml
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -29,14 +29,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   aodh-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   gnocchi-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -52,7 +52,7 @@ applications:
       - '3'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     to:
       - '4'
@@ -60,7 +60,7 @@ applications:
       source: *openstack-origin
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       - '5'
 
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -76,7 +76,7 @@ applications:
       - '6'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -88,7 +88,7 @@ applications:
       - '9'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -100,7 +100,7 @@ applications:
       - '12'
 
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
index 2d9dc68..7d860ce 100644
--- a/src/tests/bundles/focal-victoria.yaml
+++ b/src/tests/bundles/focal-victoria.yaml
@@ -29,14 +29,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   aodh-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   gnocchi-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -52,7 +52,7 @@ applications:
       - '3'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     to:
       - '4'
@@ -60,7 +60,7 @@ applications:
       source: *openstack-origin
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       - '5'
 
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -76,7 +76,7 @@ applications:
       - '6'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -88,7 +88,7 @@ applications:
       - '9'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -100,7 +100,7 @@ applications:
       - '12'
 
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/groovy-victoria.yaml b/src/tests/bundles/groovy-victoria.yaml
index 23e9367..40e74d2 100644
--- a/src/tests/bundles/groovy-victoria.yaml
+++ b/src/tests/bundles/groovy-victoria.yaml
@@ -29,14 +29,14 @@ machines:
 applications:
 
   keystone-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   aodh-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
   gnocchi-mysql-router:
-    charm: cs:~openstack-charmers-next/mysql-router
+    charm: cs:~openstack-charmers/mysql-router
 
   mysql-innodb-cluster:
-    charm: cs:~openstack-charmers-next/mysql-innodb-cluster
+    charm: cs:~openstack-charmers/mysql-innodb-cluster
     num_units: 3
     options:
       source: *openstack-origin
@@ -52,7 +52,7 @@ applications:
       - '3'
 
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     to:
       - '4'
@@ -60,7 +60,7 @@ applications:
       source: *openstack-origin
 
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -68,7 +68,7 @@ applications:
       - '5'
 
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
@@ -76,7 +76,7 @@ applications:
       - '6'
 
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -88,7 +88,7 @@ applications:
       - '9'
 
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -100,7 +100,7 @@ applications:
       - '12'
 
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/trusty-mitaka.yaml b/src/tests/bundles/trusty-mitaka.yaml
index 8f4a481..53ad024 100644
--- a/src/tests/bundles/trusty-mitaka.yaml
+++ b/src/tests/bundles/trusty-mitaka.yaml
@@ -31,21 +31,21 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/xenial-mitaka.yaml b/src/tests/bundles/xenial-mitaka.yaml
index 48b800d..18625a8 100644
--- a/src/tests/bundles/xenial-mitaka.yaml
+++ b/src/tests/bundles/xenial-mitaka.yaml
@@ -16,7 +16,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -31,21 +31,21 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/xenial-ocata.yaml b/src/tests/bundles/xenial-ocata.yaml
index c4c20bc..36314d7 100644
--- a/src/tests/bundles/xenial-ocata.yaml
+++ b/src/tests/bundles/xenial-ocata.yaml
@@ -24,7 +24,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -39,28 +39,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -71,7 +71,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -82,7 +82,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/xenial-pike.yaml b/src/tests/bundles/xenial-pike.yaml
index b492237..ff7d032 100644
--- a/src/tests/bundles/xenial-pike.yaml
+++ b/src/tests/bundles/xenial-pike.yaml
@@ -24,7 +24,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -39,28 +39,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -71,7 +71,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -82,7 +82,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/tests/bundles/xenial-queens.yaml b/src/tests/bundles/xenial-queens.yaml
index 78d6365..777b84e 100644
--- a/src/tests/bundles/xenial-queens.yaml
+++ b/src/tests/bundles/xenial-queens.yaml
@@ -23,7 +23,7 @@ machines:
 # time, given that machine "0" comes up way before machine "7"
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:~openstack-charmers/percona-cluster
     num_units: 1
     options:
       source: *openstack-origin
@@ -38,28 +38,28 @@ applications:
     to:
       - '1'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:~openstack-charmers/rabbitmq-server
     num_units: 1
     options:
       source: *openstack-origin
     to:
       - '2'
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:~openstack-charmers/keystone
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '3'
   ceilometer:
-    charm: cs:~openstack-charmers-next/ceilometer
+    charm: cs:~openstack-charmers/ceilometer
     num_units: 1
     options:
       openstack-origin: *openstack-origin
     to:
       - '4'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:~openstack-charmers/ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
@@ -70,7 +70,7 @@ applications:
       - '6'
       - '7'
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:~openstack-charmers/ceph-mon
     num_units: 3
     options:
       expected-osd-count: 3
@@ -81,7 +81,7 @@ applications:
       - '9'
       - '10'
   gnocchi:
-    charm: cs:~openstack-charmers-next/gnocchi
+    charm: cs:~openstack-charmers/gnocchi
     num_units: 1
     options:
       openstack-origin: *openstack-origin
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 71d6a2d..1a7d8c2 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -2,6 +2,6 @@
 Jinja2<=2.10.1
 psutil
 
-git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
+git+https://opendev.org/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
 
-git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
+git+https://github.com/juju/charm-helpers.git@stable/21.01#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index 3f08524..7765d0e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -35,7 +35,7 @@ mock>=1.2; python_version >= '3.6'
 
 nose>=1.3.7
 coverage>=3.6
-git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack
+git+https://github.com/openstack/charms.openstack.git@stable/21.01#egg=charms.openstack
 #
 # Revisit for removal / mock improvement:
 netifaces        # vault