From 23e28db91f2d7e5f1d44f31e511910a71613f604 Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Sat, 3 Apr 2021 20:18:02 +0100 Subject: [PATCH] 21.04 libraries freeze for charms on master branch * charm-helpers sync for classic charms * build.lock file for reactive charms * ensure tox.ini is from release-tools * ensure requirements.txt files are from release-tools * On reactive charms: - ensure stable/21.04 branch for charms.openstack - ensure stable/21.04 branch for charm-helpers Change-Id: Ic820ea4ac8daaf5f7155f7c74e352f6cf210ddbc --- charm-helpers-hooks.yaml | 2 +- test-requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charm-helpers-hooks.yaml b/charm-helpers-hooks.yaml index 85347829..b3525744 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/21.04 destination: charmhelpers include: - core diff --git a/test-requirements.txt b/test-requirements.txt index 9aea716b..394e4d37 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -42,8 +42,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;python_version>='3.0' -git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack +git+https://github.com/openstack-charmers/zaza.git@stable/21.04#egg=zaza;python_version>='3.0' +git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/21.04#egg=zaza.openstack # Needed for charm-glance: git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'