From 561e22d2629e6e597b38b30ec783a774960be41a Mon Sep 17 00:00:00 2001 From: Alex Kavanagh Date: Mon, 3 May 2021 15:33:47 +0100 Subject: [PATCH] Updates to flip all libraries back to master This patchset updates all the requirements for charms.openstack, charm-helpers, charms.ceph, zaza and zaza-openstack-tests back to master branch. Change-Id: I3a67beb7b06d6dec5fbb356ad6fa01a0a9590495 --- 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 4327f298..da4d3bbc 100644 --- a/charm-helpers-hooks.yaml +++ b/charm-helpers-hooks.yaml @@ -1,4 +1,4 @@ -repo: https://github.com/juju/charm-helpers@stable/21.04 +repo: https://github.com/juju/charm-helpers destination: hooks/charmhelpers include: - core diff --git a/test-requirements.txt b/test-requirements.txt index 394e4d37..9aea716b 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@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 +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 # Needed for charm-glance: git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.6'