From 63cb129b5955299c0bf2f0a915e60d5cd7b13a2e Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Tue, 12 Jan 2021 15:24:13 +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: Ie85b5ad32c35d188906144c96988a2ca6190faca
---
 rebuild               | 2 +-
 src/wheelhouse.txt    | 4 ++++
 test-requirements.txt | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 src/wheelhouse.txt

diff --git a/rebuild b/rebuild
index 074fb5c..b1d3037 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
-502f1634-0e2c-11eb-9c21-03817fbed443
+6fd92a7e-5418-11eb-8210-a3f03e2868b6
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
new file mode 100644
index 0000000..9131674
--- /dev/null
+++ b/src/wheelhouse.txt
@@ -0,0 +1,4 @@
+
+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