From 4a9849ac02902279a2dc45e785afc54df5ec22cf Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Thu, 13 Aug 2020 11:34:45 +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: Id0ea4b5e63d1426455c198f7e641002907219ff7 --- .gitreview | 2 ++ src/tests/bundles/focal-full.yaml | 34 +++++++++---------- src/tests/bundles/focal.yaml | 8 ++--- src/tests/bundles/groovy-full.yaml | 34 +++++++++---------- src/tests/bundles/groovy.yaml | 8 ++--- .../bundles/overlays/focal-full-ha.yaml.j2 | 4 +-- .../bundles/overlays/groovy-full-ha.yaml.j2 | 4 +-- src/wheelhouse.txt | 4 +++ test-requirements.txt | 2 +- 9 files changed, 53 insertions(+), 47 deletions(-) diff --git a/.gitreview b/.gitreview index afac541..cd9a328 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-mysql-innodb-cluster.git + +defaultbranch=stable/20.08 diff --git a/src/tests/bundles/focal-full.yaml b/src/tests/bundles/focal-full.yaml index 861a1c5..a3c04de 100644 --- a/src/tests/bundles/focal-full.yaml +++ b/src/tests/bundles/focal-full.yaml @@ -5,44 +5,44 @@ series: &series focal applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-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 neutron-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 vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 options: source: *openstack-origin keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: @@ -50,20 +50,20 @@ applications: neutron-security-groups: true openstack-origin: *openstack-origin glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -72,7 +72,7 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/focal.yaml b/src/tests/bundles/focal.yaml index b849d84..a246f19 100644 --- a/src/tests/bundles/focal.yaml +++ b/src/tests/bundles/focal.yaml @@ -1,18 +1,18 @@ series: focal applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: series: focal charm: ../../../mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - vault:certificates diff --git a/src/tests/bundles/groovy-full.yaml b/src/tests/bundles/groovy-full.yaml index 9905cfe..c8e0b2f 100644 --- a/src/tests/bundles/groovy-full.yaml +++ b/src/tests/bundles/groovy-full.yaml @@ -5,44 +5,44 @@ series: &series groovy applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router nova-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 neutron-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 vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: charm: ../../../mysql-innodb-cluster num_units: 3 options: source: *openstack-origin keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 options: openstack-origin: *openstack-origin rabbitmq-server: - charm: cs:~openstack-charmers-next/rabbitmq-server + charm: cs:~openstack-charmers/rabbitmq-server num_units: 1 options: source: *openstack-origin vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 ovn-central: - charm: cs:~openstack-charmers-next/ovn-central + charm: cs:~openstack-charmers/ovn-central num_units: 3 options: source: *openstack-origin neutron-api-plugin-ovn: - charm: cs:~openstack-charmers-next/neutron-api-plugin-ovn + charm: cs:~openstack-charmers/neutron-api-plugin-ovn neutron-api: - charm: cs:~openstack-charmers-next/neutron-api + charm: cs:~openstack-charmers/neutron-api series: *series num_units: 1 options: @@ -50,20 +50,20 @@ applications: neutron-security-groups: true openstack-origin: *openstack-origin glance: - charm: cs:~openstack-charmers-next/glance + charm: cs:~openstack-charmers/glance num_units: 1 options: openstack-origin: *openstack-origin nova-cloud-controller: - charm: cs:~openstack-charmers-next/nova-cloud-controller + charm: cs:~openstack-charmers/nova-cloud-controller num_units: 1 options: network-manager: Neutron openstack-origin: *openstack-origin ovn-chassis: - charm: cs:~openstack-charmers-next/ovn-chassis + charm: cs:~openstack-charmers/ovn-chassis nova-compute: - charm: cs:~openstack-charmers-next/nova-compute + charm: cs:~openstack-charmers/nova-compute num_units: 1 options: config-flags: default_ephemeral_format=ext4 @@ -72,7 +72,7 @@ applications: migration-auth-type: ssh openstack-origin: *openstack-origin placement: - charm: cs:~openstack-charmers-next/placement + charm: cs:~openstack-charmers/placement num_units: 1 options: openstack-origin: *openstack-origin diff --git a/src/tests/bundles/groovy.yaml b/src/tests/bundles/groovy.yaml index 2241e53..454daa5 100644 --- a/src/tests/bundles/groovy.yaml +++ b/src/tests/bundles/groovy.yaml @@ -1,18 +1,18 @@ series: groovy applications: keystone-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router vault-mysql-router: - charm: cs:~openstack-charmers-next/mysql-router + charm: cs:~openstack-charmers/mysql-router mysql-innodb-cluster: series: groovy charm: ../../../mysql-innodb-cluster num_units: 3 keystone: - charm: cs:~openstack-charmers-next/keystone + charm: cs:~openstack-charmers/keystone num_units: 1 vault: - charm: cs:~openstack-charmers-next/vault + charm: cs:~openstack-charmers/vault num_units: 1 relations: - - vault:certificates diff --git a/src/tests/bundles/overlays/focal-full-ha.yaml.j2 b/src/tests/bundles/overlays/focal-full-ha.yaml.j2 index 2d8fd26..aba8fe4 100644 --- a/src/tests/bundles/overlays/focal-full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/focal-full-ha.yaml.j2 @@ -8,9 +8,9 @@ applications: options: vip: {{TEST_VIP01}} keystone-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster nova-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster relations: - ["keystone:ha", "keystone-hacluster:ha"] - ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 b/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 index 2d8fd26..aba8fe4 100644 --- a/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 +++ b/src/tests/bundles/overlays/groovy-full-ha.yaml.j2 @@ -8,9 +8,9 @@ applications: options: vip: {{TEST_VIP01}} keystone-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster nova-hacluster: - charm: cs:~openstack-charmers-next/hacluster + charm: cs:~openstack-charmers/hacluster relations: - ["keystone:ha", "keystone-hacluster:ha"] - ["nova-cloud-controller:ha", "nova-hacluster:ha"] diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt index ea94e6d..8dc0268 100644 --- a/src/wheelhouse.txt +++ b/src/wheelhouse.txt @@ -1,3 +1,7 @@ mysqlclient psutil tenacity + +git+https://opendev.org/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack + +git+https://github.com/juju/charm-helpers.git@stable/20.08#egg=charmhelpers diff --git a/test-requirements.txt b/test-requirements.txt index 0ab97f6..0c5b6cd 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -11,7 +11,7 @@ charms.reactive mock>=1.2 nose>=1.3.7 coverage>=3.6 -git+https://github.com/openstack/charms.openstack.git#egg=charms.openstack +git+https://github.com/openstack/charms.openstack.git@stable/20.08#egg=charms.openstack # # Revisit for removal / mock improvement: netifaces # vault