Drop pbr version ceiling and add py39 testing

- Ceiling of pbr version can create installation conflicts with pip.
- Fixes tox default env list to be python version agnostic
- Updated template to use newer jobs (include testing with newer python)

Bug: #1921679
Change-Id: Ifd0d2f810799992faa1db41b80bf93bc97d5d19d

elements/os-apply-config/install.d/os-apply-config-source-install/10-os-apply-config

@@ -17,7 +17,7 @@ else
     # envvars
     $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
+    $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
     $OS_APPLY_CONFIG_VENV_DIR/bin/pip install -U os-apply-config
 fi
 

elements/os-collect-config/install.d/os-collect-config-source-install/10-os-collect-config

@@ -15,7 +15,7 @@ else
     # downloading from pypi using http_proxy and https_proxy
     $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
+    $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
     $OS_COLLECT_CONFIG_VENV_DIR/bin/pip install -U os-collect-config
 fi
 

elements/os-net-config/install.d/os-net-config-source-install/50-os-net-config-source

@@ -17,7 +17,7 @@ else
     # envvars
     $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11,<2.0'
+    $OS_NET_CONFIG_VENV_DIR/bin/pip install -U 'pbr>=0.11'
     $OS_NET_CONFIG_VENV_DIR/bin/pip install -U os-net-config
 fi
 

elements/os-refresh-config/install.d/os-refresh-config-source-install/10-os-refresh-config

@@ -21,7 +21,7 @@ else
     /opt/stack/venvs/os-refresh-config/bin/pip install -U pip
     /opt/stack/venvs/os-refresh-config/bin/pip install -U 'setuptools>=1.0'
     # bug #1293812 : Avoid easy_install triggering on pbr.
-    /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11,<2.0'
+    /opt/stack/venvs/os-refresh-config/bin/pip install -U 'pbr>=0.11'
     /opt/stack/venvs/os-refresh-config/bin/pip install -U os-refresh-config
 fi
 

elements/os-svc-install/bin/os-svc-install

@@ -38,7 +38,7 @@ function python_install() {
         pip install -U 'setuptools>=1.0'
 
         # bug #1293812 : Avoid easy_install triggering on pbr.
-        pip install -U 'pbr>=0.11,<2.0'
+        pip install -U 'pbr>=0.11'
 
         if [ -n "$reqs" ] ; then
             # Install requirements off source repo if the install type

setup.cfg

@@ -21,6 +21,8 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 data_files =

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 minversion = 2.0
 skipsdist = True
-envlist = pep8,py37
+envlist = pep8,py
 
 [testenv]
 basepython = python3

zuul.d/layout.yaml

@@ -1,7 +1,7 @@
 - project:
     templates:
       - tripleo-buildimage-jobs
-      - openstack-python3-victoria-jobs
+      - openstack-python3-wallaby-jobs
       - release-notes-jobs-python3
     post:
       jobs: