From 5f8ebcd40317c8cf5170aeeaf02ae773c328fc6f Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 17 Feb 2020 15:43:42 +0000
Subject: [PATCH] Updates for stable branch creation

Set default branch for git review/gerrit.

Switch amulet tests to stable.

Switch zaza bundles to stable charms.

Switch to using stable charm-helpers branch.

Change-Id: Ibf674f815a72f628ae9b11fd17ef5a3a07f3ed92
---
 .gitreview                       |  2 ++
 charm-helpers-hooks.yaml         |  2 +-
 tests/bundles/bionic-queens.yaml | 14 +++++++-------
 tests/bundles/bionic-rocky.yaml  | 14 +++++++-------
 tests/bundles/bionic-stein.yaml  | 14 +++++++-------
 tests/bundles/bionic-train.yaml  | 14 +++++++-------
 tests/bundles/disco-stein.yaml   | 14 +++++++-------
 tests/bundles/trusty-mitaka.yaml | 12 ++++++------
 tests/bundles/xenial-mitaka.yaml | 14 +++++++-------
 tests/bundles/xenial-ocata.yaml  | 14 +++++++-------
 tests/bundles/xenial-pike.yaml   | 14 +++++++-------
 tests/bundles/xenial-queens.yaml | 14 +++++++-------
 12 files changed, 72 insertions(+), 70 deletions(-)

diff --git a/.gitreview b/.gitreview
index a3092d7..3d6239e 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-cinder-backup.git
+
+defaultbranch=stable/20.02
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index fb8058e..d093ad3 100644
--- a/charm-helpers-hooks.yaml
+++ b/charm-helpers-hooks.yaml
@@ -1,4 +1,4 @@
-repo: https://github.com/juju/charm-helpers
+repo: https://github.com/juju/charm-helpers@stable/20.02
 destination: hooks/charmhelpers
 include:
     - core
diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml
index cc49662..8dbadd4 100644
--- a/tests/bundles/bionic-queens.yaml
+++ b/tests/bundles/bionic-queens.yaml
@@ -20,30 +20,30 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -54,6 +54,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml
index 1c98138..5344523 100644
--- a/tests/bundles/bionic-rocky.yaml
+++ b/tests/bundles/bionic-rocky.yaml
@@ -20,36 +20,36 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       source: cloud:bionic-rocky
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
       source: cloud:bionic-rocky
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
       source: cloud:bionic-rocky
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -61,6 +61,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml
index 6d7ebcb..b052fc4 100644
--- a/tests/bundles/bionic-stein.yaml
+++ b/tests/bundles/bionic-stein.yaml
@@ -20,36 +20,36 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       source: cloud:bionic-stein
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
       source: cloud:bionic-stein
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
       source: cloud:bionic-stein
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -61,6 +61,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
index 23feb47..ec4653c 100644
--- a/tests/bundles/bionic-train.yaml
+++ b/tests/bundles/bionic-train.yaml
@@ -20,35 +20,35 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       source: cloud:bionic-train
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       source: cloud:bionic-train
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
       source: cloud:bionic-train
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -60,6 +60,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/disco-stein.yaml b/tests/bundles/disco-stein.yaml
index edf8943..517c4ea 100644
--- a/tests/bundles/disco-stein.yaml
+++ b/tests/bundles/disco-stein.yaml
@@ -20,30 +20,30 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -54,6 +54,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml
index 99ff3c5..fee3ec5 100644
--- a/tests/bundles/trusty-mitaka.yaml
+++ b/tests/bundles/trusty-mitaka.yaml
@@ -27,29 +27,29 @@ applications:
       max-connections: 1000
       source: cloud:trusty-mitaka
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
       source: cloud:trusty-mitaka
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
       source: cloud:trusty-mitaka
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -61,6 +61,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml
index f0c5c24..c1569ce 100644
--- a/tests/bundles/xenial-mitaka.yaml
+++ b/tests/bundles/xenial-mitaka.yaml
@@ -20,30 +20,30 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -54,6 +54,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml
index 56abb3c..103865a 100644
--- a/tests/bundles/xenial-ocata.yaml
+++ b/tests/bundles/xenial-ocata.yaml
@@ -20,36 +20,36 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       source: cloud:xenial-ocata
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
       source: cloud:xenial-ocata
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
       source: cloud:xenial-ocata
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -61,6 +61,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml
index 7be79dc..99af4bf 100644
--- a/tests/bundles/xenial-pike.yaml
+++ b/tests/bundles/xenial-pike.yaml
@@ -20,36 +20,36 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       source: cloud:xenial-pike
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
       source: cloud:xenial-pike
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
       source: cloud:xenial-pike
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -61,6 +61,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file
diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml
index 32e2efa..e52c41e 100644
--- a/tests/bundles/xenial-queens.yaml
+++ b/tests/bundles/xenial-queens.yaml
@@ -20,36 +20,36 @@ relations:
   - rabbitmq-server:amqp
 applications:
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     options:
       innodb-buffer-pool-size: 256M
       max-connections: 1000
       source: cloud:xenial-queens
   keystone:
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
   ceph-mon:
-    charm: cs:~openstack-charmers-next/ceph-mon
+    charm: cs:ceph-mon
     num_units: 3
     options:
       monitor-count: '3'
       auth-supported: 'none'
       source: cloud:xenial-queens
   ceph-osd:
-    charm: cs:~openstack-charmers-next/ceph-osd
+    charm: cs:ceph-osd
     num_units: 3
     storage:
       osd-devices: 'cinder,10G'
     options:
       source: cloud:xenial-queens
   cinder:
-    charm: cs:~openstack-charmers-next/cinder
+    charm: cs:cinder
     num_units: 1
     options:
       block-device: 'None'
@@ -61,6 +61,6 @@ applications:
     options:
       ceph-osd-replication-count: 3
   cinder-ceph:
-    charm: cs:~openstack-charmers-next/cinder-ceph
+    charm: cs:cinder-ceph
     options:
       ceph-osd-replication-count: 3
\ No newline at end of file