Add focal-victoria to the test gate

Also sync latest release-tools templates

Change-Id: Iea3536fc83e5ab5865ecf10ca04c7914a8bac2be

requirements.txt

@@ -3,6 +3,7 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 # Build requirements
 charm-tools>=2.4.4
 # importlib-resources 1.1.0 removed Python 3.5 support

src/tests/tests.yaml

@@ -16,10 +16,10 @@ gate_bundles:
   - bionic-train
   - bionic-ussuri
   - focal-ussuri
+  - focal-victoria
 smoke_bundles:
   - bionic-train
 dev_bundles:
-  - focal-victoria
   - groovy-victoria
 tests_options:
   force_deploy:

test-requirements.txt

@@ -3,8 +3,9 @@
 # choices of *requirements.txt files for OpenStack Charms:
 #     https://github.com/openstack-charmers/release-tools
 #
+setuptools<50.0.0  # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
 # Lint and unit test requirements
-flake8>=2.2.4,<=2.4.1
+flake8>=2.2.4
 stestr>=2.2.0
 requests>=2.18.4
 charms.reactive

tox.ini

@@ -94,4 +94,4 @@ commands = {posargs}
 
 [flake8]
 # E402 ignore necessary for path append before sys module import in actions
-ignore = E402,W504
+ignore = E402,W503