From 2baf173cbe6b2ee51043df165a2bdfd425e35496 Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 24 Oct 2019 12:28:39 -0700 Subject: [PATCH] Updates for stable branch creation Set default branch for git review/gerrit. Switch amulet tests to stable. Switch to using stable charm-helpers branch. Change-Id: I6d3364b2d6fc0d4cf82ca026da32dbeeecb7aa26 --- .gitreview | 2 ++ charm-helpers-hooks.yaml | 2 +- tests/basic_deployment.py | 2 +- tests/bundles/bionic-ha.yaml | 15 ++++++++++++++- tests/bundles/bionic.yaml | 2 +- tests/bundles/disco-ha.yaml | 15 ++++++++++++++- tests/bundles/disco.yaml | 2 +- tests/bundles/overlays/bionic-ha.yaml | 15 ++++++++++++++- tests/bundles/overlays/disco-ha.yaml | 15 ++++++++++++++- tests/bundles/overlays/ha.yaml | 2 +- .../bundles/overlays/local-charm-overlay.yaml.j2 | 2 +- tests/bundles/overlays/xenial-ha.yaml | 15 ++++++++++++++- tests/bundles/xenial-ha.yaml | 15 ++++++++++++++- tests/bundles/xenial.yaml | 2 +- 14 files changed, 93 insertions(+), 13 deletions(-) mode change 120000 => 100644 tests/bundles/bionic-ha.yaml mode change 120000 => 100644 tests/bundles/disco-ha.yaml mode change 120000 => 100644 tests/bundles/overlays/bionic-ha.yaml mode change 120000 => 100644 tests/bundles/overlays/disco-ha.yaml mode change 120000 => 100644 tests/bundles/overlays/xenial-ha.yaml mode change 120000 => 100644 tests/bundles/xenial-ha.yaml diff --git a/.gitreview b/.gitreview index 0b37d86..776e751 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-percona-cluster.git + +defaultbranch=stable/19.10 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 09030dd..ecfa5ba 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/19.10 destination: charmhelpers include: - core diff --git a/tests/basic_deployment.py b/tests/basic_deployment.py index afc82fb..1252e39 100644 --- a/tests/basic_deployment.py +++ b/tests/basic_deployment.py @@ -21,7 +21,7 @@ class BasicDeployment(OpenStackAmuletDeployment): utils = AmuletUtils() def __init__(self, vip=None, units=1, series="trusty", openstack=None, - source=None, stable=False): + source=None, stable=True): super(BasicDeployment, self).__init__(series, openstack, source, stable) self.units = units diff --git a/tests/bundles/bionic-ha.yaml b/tests/bundles/bionic-ha.yaml deleted file mode 120000 index 3698a27..0000000 --- a/tests/bundles/bionic-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -bionic.yaml \ No newline at end of file diff --git a/tests/bundles/bionic-ha.yaml b/tests/bundles/bionic-ha.yaml new file mode 100644 index 0000000..66093ef --- /dev/null +++ b/tests/bundles/bionic-ha.yaml @@ -0,0 +1,14 @@ +series: bionic +relations: +- - keystone:shared-db + - percona-cluster:shared-db +applications: + percona-cluster: + series: bionic + charm: ../../../percona-cluster + num_units: 1 + keystone: + charm: cs:keystone + num_units: 1 + options: + token-expiration: 60 diff --git a/tests/bundles/bionic.yaml b/tests/bundles/bionic.yaml index e887743..66093ef 100644 --- a/tests/bundles/bionic.yaml +++ b/tests/bundles/bionic.yaml @@ -8,7 +8,7 @@ applications: charm: ../../../percona-cluster num_units: 1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:keystone num_units: 1 options: token-expiration: 60 diff --git a/tests/bundles/disco-ha.yaml b/tests/bundles/disco-ha.yaml deleted file mode 120000 index 06abc05..0000000 --- a/tests/bundles/disco-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -disco.yaml \ No newline at end of file diff --git a/tests/bundles/disco-ha.yaml b/tests/bundles/disco-ha.yaml new file mode 100644 index 0000000..9614c00 --- /dev/null +++ b/tests/bundles/disco-ha.yaml @@ -0,0 +1,14 @@ +series: disco +relations: +- - keystone:shared-db + - percona-cluster:shared-db +applications: + percona-cluster: + series: disco + charm: ../../../percona-cluster + num_units: 1 + keystone: + charm: cs:keystone + num_units: 1 + options: + token-expiration: 60 diff --git a/tests/bundles/disco.yaml b/tests/bundles/disco.yaml index 056ce40..9614c00 100644 --- a/tests/bundles/disco.yaml +++ b/tests/bundles/disco.yaml @@ -8,7 +8,7 @@ applications: charm: ../../../percona-cluster num_units: 1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:keystone num_units: 1 options: token-expiration: 60 diff --git a/tests/bundles/overlays/bionic-ha.yaml b/tests/bundles/overlays/bionic-ha.yaml deleted file mode 120000 index 8ba59d0..0000000 --- a/tests/bundles/overlays/bionic-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -ha.yaml \ No newline at end of file diff --git a/tests/bundles/overlays/bionic-ha.yaml b/tests/bundles/overlays/bionic-ha.yaml new file mode 100644 index 0000000..affc1d0 --- /dev/null +++ b/tests/bundles/overlays/bionic-ha.yaml @@ -0,0 +1,14 @@ +relations: +- - percona-cluster + - hacluster + +applications: + percona-cluster: + num_units: 3 + options: + min-cluster-size: 3 + hacluster: + charm: cs:hacluster + num_units: 0 + options: + cluster_count: 3 diff --git a/tests/bundles/overlays/disco-ha.yaml b/tests/bundles/overlays/disco-ha.yaml deleted file mode 120000 index 8ba59d0..0000000 --- a/tests/bundles/overlays/disco-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -ha.yaml \ No newline at end of file diff --git a/tests/bundles/overlays/disco-ha.yaml b/tests/bundles/overlays/disco-ha.yaml new file mode 100644 index 0000000..affc1d0 --- /dev/null +++ b/tests/bundles/overlays/disco-ha.yaml @@ -0,0 +1,14 @@ +relations: +- - percona-cluster + - hacluster + +applications: + percona-cluster: + num_units: 3 + options: + min-cluster-size: 3 + hacluster: + charm: cs:hacluster + num_units: 0 + options: + cluster_count: 3 diff --git a/tests/bundles/overlays/ha.yaml b/tests/bundles/overlays/ha.yaml index 22faf0b..affc1d0 100644 --- a/tests/bundles/overlays/ha.yaml +++ b/tests/bundles/overlays/ha.yaml @@ -8,7 +8,7 @@ applications: options: min-cluster-size: 3 hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:hacluster num_units: 0 options: cluster_count: 3 diff --git a/tests/bundles/overlays/local-charm-overlay.yaml.j2 b/tests/bundles/overlays/local-charm-overlay.yaml.j2 index bdb3dfc..853f6a8 100644 --- a/tests/bundles/overlays/local-charm-overlay.yaml.j2 +++ b/tests/bundles/overlays/local-charm-overlay.yaml.j2 @@ -15,7 +15,7 @@ applications: vip: {{ OS_VIP00 }} min-cluster-size: 3 hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:hacluster num_units: 0 options: cluster_count: 3 diff --git a/tests/bundles/overlays/xenial-ha.yaml b/tests/bundles/overlays/xenial-ha.yaml deleted file mode 120000 index 8ba59d0..0000000 --- a/tests/bundles/overlays/xenial-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -ha.yaml \ No newline at end of file diff --git a/tests/bundles/overlays/xenial-ha.yaml b/tests/bundles/overlays/xenial-ha.yaml new file mode 100644 index 0000000..affc1d0 --- /dev/null +++ b/tests/bundles/overlays/xenial-ha.yaml @@ -0,0 +1,14 @@ +relations: +- - percona-cluster + - hacluster + +applications: + percona-cluster: + num_units: 3 + options: + min-cluster-size: 3 + hacluster: + charm: cs:hacluster + num_units: 0 + options: + cluster_count: 3 diff --git a/tests/bundles/xenial-ha.yaml b/tests/bundles/xenial-ha.yaml deleted file mode 120000 index 7f07a7e..0000000 --- a/tests/bundles/xenial-ha.yaml +++ /dev/null @@ -1 +0,0 @@ -xenial.yaml \ No newline at end of file diff --git a/tests/bundles/xenial-ha.yaml b/tests/bundles/xenial-ha.yaml new file mode 100644 index 0000000..27cc7b4 --- /dev/null +++ b/tests/bundles/xenial-ha.yaml @@ -0,0 +1,14 @@ +series: xenial +relations: +- - keystone:shared-db + - percona-cluster:shared-db +applications: + percona-cluster: + series: xenial + charm: ../../../percona-cluster + num_units: 1 + keystone: + charm: cs:keystone + num_units: 1 + options: + token-expiration: 60 diff --git a/tests/bundles/xenial.yaml b/tests/bundles/xenial.yaml index a0575c6..27cc7b4 100644 --- a/tests/bundles/xenial.yaml +++ b/tests/bundles/xenial.yaml @@ -8,7 +8,7 @@ applications: charm: ../../../percona-cluster num_units: 1 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:keystone num_units: 1 options: token-expiration: 60