Add impish bundle

- add non-voting impish bundle
- rebuild to pick up charm-helpers changes
- update tox/pip.sh to ensure setuptools<50.0.0

Change-Id: Ie53a621c5e1bdcad124e4dfb5ea3e0debd2b3d91
Co-authored-by: Aurelien Lourot <aurelien.lourot@canonical.com>

osci.yaml

@@ -7,6 +7,8 @@
       - focal-basic
       - groovy-basic
       - hirsute-basic
+      - impish-basic:
+          voting: false
     vars:
       needs_charm_build: true
       charm_build_name: pacemaker-remote
@@ -41,3 +43,9 @@
     dependencies: *smoke-jobs
     vars:
       tox_extra_args: hirsute-basic
+- job:
+    name: impish-basic
+    parent: func-target
+    dependencies: *smoke-jobs
+    vars:
+      tox_extra_args: impish-basic

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 "$@"

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
-fa4ea1d8-b3eb-11eb-be2d-33ffca71baf3
+53f0df32-1178-11ec-8ff0-bbc15f7f6b26

src/tests/bundles/impish-basic.yaml

@@ -0,0 +1,34 @@
+series: impish
+
+applications:
+
+  api:
+    charm: cs:ubuntu
+    num_units: 3
+
+  hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    options:
+      corosync_transport: unicast
+      cluster_count: 3
+
+  compute:
+    charm: cs:ubuntu
+    num_units: 1
+
+  pacemaker-remote:
+    charm: pacemaker-remote
+    options:
+      enable-stonith: False
+      enable-resources: False
+
+relations:
+
+  - - 'compute:juju-info'
+    - 'pacemaker-remote:juju-info'
+
+  - - 'api:juju-info'
+    - 'hacluster:juju-info'
+
+  - - 'hacluster:pacemaker-remote'
+    - 'pacemaker-remote:pacemaker-remote'

src/tests/tests.yaml

@@ -16,6 +16,7 @@ smoke_bundles:
 
 dev_bundles:
   - hirsute-basic
+  - impish-basic
 
 target_deploy_status:
   # NOTE(lourot): cs:ubuntu has now an empty status message when ready:
@@ -28,4 +29,7 @@ target_deploy_status:
 
 tests_options:
   force_deploy:
+    # NOTE(lourot): cs:ubuntu doesn't support hirsute officially in its
+    # metadata:
     - hirsute-basic
+    - impish-basic

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 =

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