From 6fe492f9c025749eb04af3242e1711a5547382f2 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Tue, 12 Jan 2021 15:24:12 +0000
Subject: [PATCH] Updates for testing period for 20.01 release

* charm-helpers sync for classic charms
* rebuild for reactive charms
* ensure tox.ini is from release-tools
* ensure requirements.txt files are from release-tools
* On reactive charms:
  - ensure master branch for charms.openstack
  - ensure master branch for charm-helpers

Change-Id: Ib9a01f611397ba6ba926cc8518e41f930b249fd7
---
 rebuild               | 2 +-
 src/wheelhouse.txt    | 4 ++++
 test-requirements.txt | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rebuild b/rebuild
index 74fb842..000e8c7 100644
--- a/rebuild
+++ b/rebuild
@@ -2,4 +2,4 @@
 # when dependencies of the charm change,
 # but nothing in the charm needs to.
 # simply change the uuid to something new
-4fef9fea-0e2c-11eb-a1aa-2f91f544c950
+6f8e775e-5418-11eb-a0f3-d328171aeb5f
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index 92bc56c..71d6a2d 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,3 +1,7 @@
 # pin Jinja2 to the last versions supporting python 3.4 for trusty
 Jinja2<=2.10.1
 psutil
+
+git+https://opendev.org/openstack/charms.openstack.git#egg=charms.openstack
+
+git+https://github.com/juju/charm-helpers.git#egg=charmhelpers
diff --git a/test-requirements.txt b/test-requirements.txt
index 8ab24b2..3f08524 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -22,6 +22,8 @@ importlib-resources<3.0.0; python_version < '3.6'
 # dropped support for python 3.5:
 osprofiler<2.7.0;python_version<'3.6'
 stevedore<1.31.0;python_version<'3.6'
+debtcollector<1.22.0;python_version<'3.6'
+oslo.utils<=3.41.0;python_version<'3.6'
 
 requests>=2.18.4
 charms.reactive