From 259a7f1847964e7f48924169d30d72f206cdfc81 Mon Sep 17 00:00:00 2001 From: Aurelien Lourot Date: Mon, 2 Nov 2020 11:53:39 +0100 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: I27b247a468494a98e870396ab3877ce9669e3510 --- .gitreview | 2 ++ charm-helpers-hooks.yaml | 2 +- tests/bundles/bionic-queens.yaml | 6 +++--- tests/bundles/bionic-rocky.yaml | 6 +++--- tests/bundles/bionic-stein.yaml | 6 +++--- tests/bundles/bionic-train.yaml | 6 +++--- tests/bundles/bionic-ussuri.yaml | 6 +++--- tests/bundles/focal-ussuri.yaml | 10 +++++----- tests/bundles/focal-victoria.yaml | 10 +++++----- tests/bundles/groovy-victoria.yaml | 10 +++++----- tests/bundles/trusty-mitaka.yaml | 6 +++--- tests/bundles/xenial-mitaka.yaml | 6 +++--- tests/bundles/xenial-ocata.yaml | 6 +++--- tests/bundles/xenial-pike.yaml | 6 +++--- tests/bundles/xenial-queens.yaml | 6 +++--- 15 files changed, 48 insertions(+), 46 deletions(-) diff --git a/.gitreview b/.gitreview index fe1125ff..77f58d0f 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-rabbitmq-server.git + +defaultbranch=stable/20.10 diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 42d30492..f6a4e266 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,5 +1,5 @@ destination: charmhelpers -repo: https://github.com/juju/charm-helpers +repo: https://github.com/juju/charm-helpers@stable/20.10 include: - fetch - core diff --git a/tests/bundles/bionic-queens.yaml b/tests/bundles/bionic-queens.yaml index f986ae76..0fccda56 100644 --- a/tests/bundles/bionic-queens.yaml +++ b/tests/bundles/bionic-queens.yaml @@ -27,15 +27,15 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack diff --git a/tests/bundles/bionic-rocky.yaml b/tests/bundles/bionic-rocky.yaml index 1f159b60..d390b56d 100644 --- a/tests/bundles/bionic-rocky.yaml +++ b/tests/bundles/bionic-rocky.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/bionic-stein.yaml b/tests/bundles/bionic-stein.yaml index 24805a24..6eada594 100644 --- a/tests/bundles/bionic-stein.yaml +++ b/tests/bundles/bionic-stein.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml index f5670166..f2d8e09e 100644 --- a/tests/bundles/bionic-train.yaml +++ b/tests/bundles/bionic-train.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/bionic-ussuri.yaml b/tests/bundles/bionic-ussuri.yaml index a7cb8aa5..7a8bfca7 100644 --- a/tests/bundles/bionic-ussuri.yaml +++ b/tests/bundles/bionic-ussuri.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/focal-ussuri.yaml b/tests/bundles/focal-ussuri.yaml index 517bc842..c62f5dd3 100644 --- a/tests/bundles/focal-ussuri.yaml +++ b/tests/bundles/focal-ussuri.yaml @@ -24,12 +24,12 @@ machines: applications: keystone-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 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 @@ -56,7 +56,7 @@ applications: - '5' cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -64,7 +64,7 @@ applications: - '6' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/focal-victoria.yaml b/tests/bundles/focal-victoria.yaml index 620fc3ac..222c8a5b 100644 --- a/tests/bundles/focal-victoria.yaml +++ b/tests/bundles/focal-victoria.yaml @@ -24,12 +24,12 @@ machines: applications: keystone-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 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 @@ -56,7 +56,7 @@ applications: - '5' cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -64,7 +64,7 @@ applications: - '6' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/groovy-victoria.yaml b/tests/bundles/groovy-victoria.yaml index 324802fa..5f8ad452 100644 --- a/tests/bundles/groovy-victoria.yaml +++ b/tests/bundles/groovy-victoria.yaml @@ -24,12 +24,12 @@ machines: applications: keystone-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 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 @@ -56,7 +56,7 @@ applications: - '5' cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin @@ -64,7 +64,7 @@ applications: - '6' keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/trusty-mitaka.yaml b/tests/bundles/trusty-mitaka.yaml index 8dc99443..35593fbb 100644 --- a/tests/bundles/trusty-mitaka.yaml +++ b/tests/bundles/trusty-mitaka.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster-340 + charm: cs:~openstack-charmers/percona-cluster-340 num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/xenial-mitaka.yaml b/tests/bundles/xenial-mitaka.yaml index 30f838f8..944920c1 100644 --- a/tests/bundles/xenial-mitaka.yaml +++ b/tests/bundles/xenial-mitaka.yaml @@ -27,15 +27,15 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: admin-password: openstack diff --git a/tests/bundles/xenial-ocata.yaml b/tests/bundles/xenial-ocata.yaml index 3f4a8cef..5dbd2005 100644 --- a/tests/bundles/xenial-ocata.yaml +++ b/tests/bundles/xenial-ocata.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/xenial-pike.yaml b/tests/bundles/xenial-pike.yaml index 23fb503b..3c76c45f 100644 --- a/tests/bundles/xenial-pike.yaml +++ b/tests/bundles/xenial-pike.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin diff --git a/tests/bundles/xenial-queens.yaml b/tests/bundles/xenial-queens.yaml index 0bb974ad..d07e37d7 100644 --- a/tests/bundles/xenial-queens.yaml +++ b/tests/bundles/xenial-queens.yaml @@ -30,18 +30,18 @@ applications: management_plugin: "False" stats_cron_schedule: "*/1 * * * *" cinder: - charm: cs:~openstack-charmers-next/cinder + charm: cs:~openstack-charmers/cinder num_units: 1 options: openstack-origin: *openstack-origin percona-cluster: - charm: cs:~openstack-charmers-next/percona-cluster + charm: cs:~openstack-charmers/percona-cluster num_units: 1 options: source: *openstack-origin max-connections: 1000 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin