From 64cc0c998aa17dad6e81334a9cdf3be4a6c1d948 Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex@ajkavanagh.co.uk>
Date: Mon, 27 Jul 2020 20:09:25 +0100
Subject: [PATCH] Release sync for 20.08

- Classic charms: sync charm-helpers.
- Classic ceph based charms:  also sync charms.ceph
- Reactive charms: trigger a rebuild
- sync tox.ini
- sync requirements.txt and test-requirements.txt

Change-Id: I623f452d966bd27d826322b784b32d6b20fdf5b0
---
 rebuild     | 2 +-
 src/tox.ini | 2 +-
 tox.ini     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/rebuild b/rebuild
index ec29276..f855106 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
-920a4f8a-a4d0-11ea-b6cc-73262cb05954
+da17b1c8-d02c-11ea-b8d7-f7637e85fa83
diff --git a/src/tox.ini b/src/tox.ini
index dd17ae5..8a91d50 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -43,7 +43,7 @@ commands =
 # Run a specific test as an Amulet smoke test (expected to always pass)
 basepython = python2.7
 commands =
-    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-train --no-destroy
+    bundletester -vl DEBUG -r json -o func-results.json gate-basic-bionic-stein --no-destroy
 
 [testenv:func-dev]
 # Run all development test targets which are +x (may not always pass!)
diff --git a/tox.ini b/tox.ini
index 5b41c1d..afd48f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -50,6 +50,11 @@ basepython = python3.7
 deps = -r{toxinidir}/test-requirements.txt
 commands = stestr run --slowest {posargs}
 
+[testenv:py38]
+basepython = python3.8
+deps = -r{toxinidir}/test-requirements.txt
+commands = stestr run --slowest {posargs}
+
 [testenv:pep8]
 basepython = python3
 deps = -r{toxinidir}/test-requirements.txt