From 98f909300f207c8005ae36d163ff6c562bf9a8ba Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Fri, 15 Apr 2022 11:55:03 +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. - Switch to using stable zaza, zaza-openstack-tests branch - (reactive charms) Add build.lock file Change-Id: Id8668691f64a4121b3eeec306097a6b37cacc64c --- .gitreview | 2 ++ charm-helpers-hooks.yaml | 2 +- test-requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitreview b/.gitreview index b71f81c8..de56aded 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,5 @@ host=review.opendev.org port=29418 project=openstack/charm-nova-compute.git + +defaultbranch=stable/yoga diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 5ee9d355..710f46a2 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/yoga destination: hooks/charmhelpers include: - core diff --git a/test-requirements.txt b/test-requirements.txt index 0aabe171..0c35ba96 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -33,8 +33,8 @@ oslo.utils<=3.41.0;python_version<'3.6' coverage>=4.5.2 pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking) -git+https://github.com/openstack-charmers/zaza.git#egg=zaza -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/yoga#egg=zaza +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/yoga#egg=zaza.openstack # Needed for charm-glance: git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'