From 84598662cdd5c9d9502ab4867cdf7780f427c64a Mon Sep 17 00:00:00 2001
From: Alex Kavanagh <alex.kavanagh@canonical.com>
Date: Mon, 27 Sep 2021 12:06:49 +0100
Subject: [PATCH] Add xena bundles

- add non-voting impish bundle
- update tox/pip.sh to ensure setuptools<50.0.0

Change-Id: I1f605d9eb905fe35d45990481e0a8662649dbfe0
---
 osci.yaml                     |  2 ++
 pip.sh                        | 18 ++++++++++++++++++
 rebuild                       |  2 +-
 src/tests/bundles/impish.yaml |  5 +++++
 src/tests/tests.yaml          |  4 +++-
 src/tox.ini                   |  4 ++--
 tox.ini                       | 17 ++++++++++++++++-
 7 files changed, 47 insertions(+), 5 deletions(-)
 create mode 100755 pip.sh
 create mode 100644 src/tests/bundles/impish.yaml

diff --git a/osci.yaml b/osci.yaml
index 78a61d5..e007013 100644
--- a/osci.yaml
+++ b/osci.yaml
@@ -7,6 +7,8 @@
       - focal
       - groovy
       - hirsute
+      - impish:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: magpie
diff --git a/pip.sh b/pip.sh
new file mode 100755
index 0000000..9a7e6b0
--- /dev/null
+++ b/pip.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+#
+# This file is managed centrally by release-tools and should not be modified
+# within individual charm repos.  See the 'global' dir contents for available
+# choices of tox.ini for OpenStack Charms:
+#     https://github.com/openstack-charmers/release-tools
+#
+# setuptools 58.0 dropped the support for use_2to3=true which is needed to
+# install blessings (an indirect dependency of charm-tools).
+#
+# More details on the beahvior of tox and virtualenv creation can be found at
+# https://github.com/tox-dev/tox/issues/448
+#
+# This script is wrapper to force the use of the pinned versions early in the
+# process when the virtualenv was created and upgraded before installing the
+# depedencies declared in the target.
+pip install 'pip<20.3' 'setuptools<50.0.0'
+pip "$@"
diff --git a/rebuild b/rebuild
index 8373ca2..e746b92 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
-fa0649e2-b3eb-11eb-9d2f-5b1a6b010b2c
+53cb6df6-1178-11ec-b383-bf4fe629ca15
diff --git a/src/tests/bundles/impish.yaml b/src/tests/bundles/impish.yaml
new file mode 100644
index 0000000..28a8f23
--- /dev/null
+++ b/src/tests/bundles/impish.yaml
@@ -0,0 +1,5 @@
+series: impish
+applications:
+  magpie:
+    num_units: 3
+    charm: magpie
diff --git a/src/tests/tests.yaml b/src/tests/tests.yaml
index 207ef78..99b4060 100644
--- a/src/tests/tests.yaml
+++ b/src/tests/tests.yaml
@@ -7,6 +7,7 @@ gate_bundles:
 
 dev_bundles:
 - hirsute
+- impish
 
 smoke_bundles:
 - focal
@@ -20,4 +21,5 @@ tests:
 
 tests_options:
   force_deploy:
-    - hirsute
+    - groovy
+    - impish
diff --git a/src/tox.ini b/src/tox.ini
index e763047..b40d295 100644
--- a/src/tox.ini
+++ b/src/tox.ini
@@ -22,12 +22,12 @@ skip_missing_interpreters = False
 requires = pip < 20.3
            virtualenv < 20.0
 # NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
-minversion = 3.2.0
+minversion = 3.18.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
          PYTHONHASHSEED=0
-whitelist_externals = juju
+allowlist_externals = juju
 passenv = HOME TERM CS_* OS_* TEST_*
 deps = -r{toxinidir}/test-requirements.txt
 install_command =
diff --git a/tox.ini b/tox.ini
index 5c81801..22159df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,6 +11,21 @@ envlist = pep8,py3
 sitepackages = False
 # NOTE: Avoid false positives by not skipping missing interpreters.
 skip_missing_interpreters = False
+# NOTES:
+# * We avoid the new dependency resolver by pinning pip < 20.3, see
+#   https://github.com/pypa/pip/issues/9187
+# * Pinning dependencies requires tox >= 3.2.0, see
+#   https://tox.readthedocs.io/en/latest/config.html#conf-requires
+# * It is also necessary to pin virtualenv as a newer virtualenv would still
+#   lead to fetching the latest pip in the func* tox targets, see
+#   https://stackoverflow.com/a/38133283
+requires =
+  pip < 20.3
+  virtualenv < 20.0
+  setuptools<50.0.0
+
+# NOTE: https://wiki.canonical.com/engineering/OpenStack/InstallLatestToxOnOsci
+minversion = 3.18.0
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
@@ -21,7 +36,7 @@ setenv = VIRTUAL_ENV={envdir}
          JUJU_REPOSITORY={toxinidir}/build
 passenv = http_proxy https_proxy INTERFACE_PATH LAYER_PATH JUJU_REPOSITORY
 install_command =
-  pip install {opts} {packages}
+  {toxinidir}/pip.sh install {opts} {packages}
 deps =
     -r{toxinidir}/requirements.txt