From 7b772cb8b60a5887460dd3a361e9e3e29f8cafe6 Mon Sep 17 00:00:00 2001 From: David Ames Date: Thu, 21 May 2020 10:00:35 -0700 Subject: [PATCH] Updates for stable branch creation 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. Change-Id: Ifd14ee073ef69d37cd69e904df8ba102b333286c --- .gitreview | 2 ++ charm-helpers-hooks.yaml | 2 +- tests/bundles/bionic-queens.yaml | 8 ++++---- tests/bundles/bionic-rocky.yaml | 8 ++++---- tests/bundles/bionic-stein.yaml | 8 ++++---- tests/bundles/bionic-train-gr-r1.yaml | 8 ++++---- tests/bundles/bionic-train-gr-r2.yaml | 2 +- tests/bundles/bionic-train.yaml | 8 ++++---- tests/bundles/bionic-ussuri.yaml | 8 ++++---- tests/bundles/focal-ussuri.yaml | 18 +++++++++--------- tests/bundles/trusty-mitaka.yaml | 6 +++--- tests/bundles/xenial-mitaka.yaml | 8 ++++---- tests/bundles/xenial-ocata.yaml | 8 ++++---- tests/bundles/xenial-pike.yaml | 8 ++++---- tests/bundles/xenial-queens.yaml | 8 ++++---- 15 files changed, 56 insertions(+), 54 deletions(-) diff --git a/.gitreview b/.gitreview index 957ee22..9579f4e 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-swift-storage.git + +defaultbranch=stable/20.05 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 9b60e61..c1c19bf 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.05 destination: charmhelpers include: - core diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index 586508d..dd09d11 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -1,7 +1,7 @@ series: bionic applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: bionic num_units: 1 options: @@ -9,18 +9,18 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 swift-storage: charm: swift-storage diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 46d4640..e6b38ff 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -1,7 +1,7 @@ series: bionic applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: bionic num_units: 1 options: @@ -10,7 +10,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-rocky percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -18,13 +18,13 @@ applications: source: cloud:bionic-rocky keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-rocky glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-rocky diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index 1aaba54..47abfa4 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -1,7 +1,7 @@ series: bionic applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: bionic num_units: 1 options: @@ -10,7 +10,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-stein percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -18,13 +18,13 @@ applications: source: cloud:bionic-stein keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-stein glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-stein diff --git a/tests/bundles/bionic-train-gr-r1.yaml b/tests/bundles/bionic-train-gr-r1.yaml index dd4d68f..3ea0494 100644 --- a/tests/bundles/bionic-train-gr-r1.yaml +++ b/tests/bundles/bionic-train-gr-r1.yaml @@ -1,7 +1,7 @@ series: bionic applications: swift-proxy-region1: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy num_units: 1 options: region: RegionOne @@ -38,7 +38,7 @@ applications: block-device: /etc/swift/storage.img|2G openstack-origin: cloud:bionic-train percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -46,13 +46,13 @@ applications: source: cloud:bionic-train keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train diff --git a/tests/bundles/bionic-train-gr-r2.yaml b/tests/bundles/bionic-train-gr-r2.yaml index 9f36d2f..a03ec77 100644 --- a/tests/bundles/bionic-train-gr-r2.yaml +++ b/tests/bundles/bionic-train-gr-r2.yaml @@ -1,7 +1,7 @@ series: bionic applications: swift-proxy-region2: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy num_units: 1 options: region: RegionTwo diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index 2ee9dd2..4c3fcfe 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -1,7 +1,7 @@ series: bionic applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: bionic num_units: 1 options: @@ -10,7 +10,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-train percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -18,13 +18,13 @@ applications: source: cloud:bionic-train keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-train glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-train diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index a607b4f..669c773 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -1,7 +1,7 @@ series: bionic applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: bionic num_units: 1 options: @@ -10,7 +10,7 @@ applications: swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae openstack-origin: cloud:bionic-ussuri percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -18,13 +18,13 @@ applications: source: cloud:bionic-ussuri keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:bionic-ussuri glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:bionic-ussuri diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 8214d77..6e8a12d 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -20,18 +20,18 @@ machines: applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router glance-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router cinder-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-cloud-controller-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router placement-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 @@ -42,7 +42,7 @@ applications: keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin @@ -50,7 +50,7 @@ applications: - '3' swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy num_units: 1 options: zone-assignment: manual @@ -62,7 +62,7 @@ applications: glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index 49d6321..6e1598f 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -1,7 +1,7 @@ series: trusty applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: trusty num_units: 1 options: @@ -18,13 +18,13 @@ applications: source: cloud:trusty-mitaka keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:trusty-mitaka glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:trusty-mitaka diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index e18adcb..718bb3f 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -1,7 +1,7 @@ series: xenial applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: xenial num_units: 1 options: @@ -9,18 +9,18 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% max-connections: 1000 keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 swift-storage: charm: swift-storage diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index d8726eb..5bb3ad9 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -1,7 +1,7 @@ series: xenial applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: xenial num_units: 1 options: @@ -10,7 +10,7 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -18,13 +18,13 @@ applications: source: cloud:xenial-ocata keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-ocata glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-ocata diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index 6ec224f..2976f35 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -1,7 +1,7 @@ series: xenial applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: xenial num_units: 1 options: @@ -10,7 +10,7 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -18,13 +18,13 @@ applications: source: cloud:xenial-pike keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-pike glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-pike diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index 21e5a37..809af9b 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -1,7 +1,7 @@ series: xenial applications: swift-proxy: - charm: cs:~openstack-charmers-next/swift-proxy + charm: cs:~openstack-charmers/swift-proxy series: xenial num_units: 1 options: @@ -10,7 +10,7 @@ applications: replicas: 1 swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: dataset-size: 25% @@ -18,13 +18,13 @@ applications: source: cloud:xenial-queens keystone: expose: True - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: cloud:xenial-queens glance: expose: True - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: cloud:xenial-queens