From 84c58d59966bbeb12877e635f9c543d075f4f5ed Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Mon, 17 Feb 2020 15:54:15 +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: I9fb074f5d13b071933091c8e100526eafa887195
---
 .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/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 +++++++-------
 11 files changed, 65 insertions(+), 63 deletions(-)

diff --git a/.gitreview b/.gitreview
index 326df038..d40edaf6 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,5 @@
 host=review.opendev.org
 port=29418
 project=openstack/charm-neutron-openvswitch.git
+
+defaultbranch=stable/20.02
diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml
index da4d3bbc..86057db5 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 e095a043..ddec396b 100644
--- a/tests/bundles/bionic_queens.yaml
+++ b/tests/bundles/bionic_queens.yaml
@@ -12,40 +12,40 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'
diff --git a/tests/bundles/bionic_rocky.yaml b/tests/bundles/bionic_rocky.yaml
index 68dc7c93..2d0dd059 100644
--- a/tests/bundles/bionic_rocky.yaml
+++ b/tests/bundles/bionic_rocky.yaml
@@ -12,14 +12,14 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -27,34 +27,34 @@ applications:
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:bionic-rocky
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'
diff --git a/tests/bundles/bionic_stein.yaml b/tests/bundles/bionic_stein.yaml
index 1165a068..07979e17 100644
--- a/tests/bundles/bionic_stein.yaml
+++ b/tests/bundles/bionic_stein.yaml
@@ -12,14 +12,14 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -27,34 +27,34 @@ applications:
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:bionic-stein
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'
diff --git a/tests/bundles/bionic_train.yaml b/tests/bundles/bionic_train.yaml
index 3233a0e1..b3f95432 100644
--- a/tests/bundles/bionic_train.yaml
+++ b/tests/bundles/bionic_train.yaml
@@ -13,14 +13,14 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -28,34 +28,34 @@ applications:
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:bionic-train
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'
diff --git a/tests/bundles/trusty_mitaka.yaml b/tests/bundles/trusty_mitaka.yaml
index 2a0612e4..05ef0e25 100644
--- a/tests/bundles/trusty_mitaka.yaml
+++ b/tests/bundles/trusty_mitaka.yaml
@@ -12,14 +12,14 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -27,27 +27,27 @@ applications:
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:trusty-mitaka
diff --git a/tests/bundles/xenial_mitaka.yaml b/tests/bundles/xenial_mitaka.yaml
index 275f977e..34643280 100644
--- a/tests/bundles/xenial_mitaka.yaml
+++ b/tests/bundles/xenial_mitaka.yaml
@@ -12,40 +12,40 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'
diff --git a/tests/bundles/xenial_ocata.yaml b/tests/bundles/xenial_ocata.yaml
index b8ed1fef..47bd089b 100644
--- a/tests/bundles/xenial_ocata.yaml
+++ b/tests/bundles/xenial_ocata.yaml
@@ -12,14 +12,14 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -27,34 +27,34 @@ applications:
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:xenial-ocata
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'
diff --git a/tests/bundles/xenial_pike.yaml b/tests/bundles/xenial_pike.yaml
index e0e2d2a8..6bd2dd8f 100644
--- a/tests/bundles/xenial_pike.yaml
+++ b/tests/bundles/xenial_pike.yaml
@@ -12,14 +12,14 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -27,34 +27,34 @@ applications:
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:xenial-pike
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'
diff --git a/tests/bundles/xenial_queens.yaml b/tests/bundles/xenial_queens.yaml
index 74ee3e5d..896acdaa 100644
--- a/tests/bundles/xenial_queens.yaml
+++ b/tests/bundles/xenial_queens.yaml
@@ -12,14 +12,14 @@ machines:
 
 applications:
   nova-compute:
-    charm: cs:~openstack-charmers-next/nova-compute
+    charm: cs:nova-compute
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
     to:
     - '1'
   nova-cloud-controller:
-    charm: cs:~openstack-charmers-next/nova-cloud-controller
+    charm: cs:nova-cloud-controller
     num_units: 1
     options:
       network-manager: Neutron
@@ -27,34 +27,34 @@ applications:
     to:
     - '2'
   rabbitmq-server:
-    charm: cs:~openstack-charmers-next/rabbitmq-server
+    charm: cs:rabbitmq-server
     num_units: 1
     to:
     - '3'
   keystone:
     num_units: 1
-    charm: cs:~openstack-charmers-next/keystone
+    charm: cs:keystone
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
     to:
     - '4'
   glance:
-    charm: cs:~openstack-charmers-next/glance
+    charm: cs:glance
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
     to:
     - '5'
   neutron-api:
-    charm: cs:~openstack-charmers-next/neutron-api
+    charm: cs:neutron-api
     num_units: 1
     options:
       openstack-origin: cloud:xenial-queens
     to:
     - '6'
   percona-cluster:
-    charm: cs:~openstack-charmers-next/percona-cluster
+    charm: cs:percona-cluster
     num_units: 1
     to:
     - '0'