summaryrefslogtreecommitdiff
path: root/playbooks
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2022-05-03 09:33:07 -0700
committerClark Boylan <clark.boylan@gmail.com>2022-07-01 15:59:48 -0700
commitd665053fe9b12bb237ffe810212772616a18ca64 (patch)
tree4eeb0fdfbbb44aa9ab064c417b15cbc8b8c432f3 /playbooks
parent4151f91684091411fc13c747fffe2114fdb4e25c (diff)
downloadzuul-d665053fe9b12bb237ffe810212772616a18ca64.tar.gz
Bump up to python3.10
This adds python3.10 testing on Jammy and switches the docker images to python3.10 from 3.8. We run sudo for postgres with -Hi to avoid non fatal errors when postres' client attempts to write command history to Zuul's homedir (it is running as the postgres user which can't write to zuul's homedir). We also need to update the libffi package version for jammy to 8 in bindep.txt. Finally, python_version values need to be quoted as "3.10" is different than 3.10 which is equivalent to 3.1 when serialized by yaml as a float. Force setuptools to use stdlib (shipped by the distro) distutils to avoid problems with virtualenvs not actually being virtualenvs. Finally we switch the bulk of jobs over to using nodeset: ubuntu-jammy as the default python there is 3.10. Change-Id: I97b90bb7a23c90f108f23dda9fdd0e89f9f4dbca
Diffstat (limited to 'playbooks')
-rw-r--r--playbooks/zuul-stream/functional.yaml2
-rw-r--r--playbooks/zuul-stream/pre.yaml7
2 files changed, 8 insertions, 1 deletions
diff --git a/playbooks/zuul-stream/functional.yaml b/playbooks/zuul-stream/functional.yaml
index fbc391ac0..ee1643fbc 100644
--- a/playbooks/zuul-stream/functional.yaml
+++ b/playbooks/zuul-stream/functional.yaml
@@ -5,7 +5,7 @@
# This value is used by Ansible to find the zuul.ansible code
# that Zuul's ansible plugins consume. It must be updated when
# the python version of the platform is changed.
- python_path: "/usr/local/lib/python3.8/dist-packages"
+ python_path: "/usr/local/lib/python3.10/dist-packages"
- name: Run ansible that should succeed
command: >
diff --git a/playbooks/zuul-stream/pre.yaml b/playbooks/zuul-stream/pre.yaml
index cafdc0133..23fae3549 100644
--- a/playbooks/zuul-stream/pre.yaml
+++ b/playbooks/zuul-stream/pre.yaml
@@ -28,6 +28,13 @@
- name: Install managed ansible versions
command: /usr/local/bin/zuul-manage-ansible -v
become: yes
+ environment:
+ # This appears to be necessary because without it the virtualenvs
+ # that virtualenv creates are not actually virtualenvs. They are just
+ # aliases for the root python installation instead. Then we try to
+ # install multiple ansible versions to the root (via multiple fake
+ # venvs) and the installation fails due to conflicts.
+ SETUPTOOLS_USE_DISTUTILS: stdlib
- name: Copy inventory
copy: