From 98c6a4261bc0ccba51f5a92ce208513b4364e8c9 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: Idcc7cd4b1563ae65cec0e5d7ef3203dc97af5c09
---
 rebuild               | 2 +-
 src/wheelhouse.txt    | 3 +++
 test-requirements.txt | 2 ++
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/rebuild b/rebuild
index 8bfc79b..a435f3f 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
-5011c106-0e2c-11eb-80be-93c066e8bce7
+6fbac1c4-5418-11eb-b278-9b1491cae811
diff --git a/src/wheelhouse.txt b/src/wheelhouse.txt
index d268cbc..c05abdf 100644
--- a/src/wheelhouse.txt
+++ b/src/wheelhouse.txt
@@ -1,4 +1,7 @@
 mysqlclient
 psutil
 tenacity
+
+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