From ae544efe21f12a0655434ebe56c710a9db666669 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Sat, 29 Jul 2023 07:49:31 -0700 Subject: [PATCH] Use Python 3.11 for stream-functional jobs We need to use Python 3.11 for all of our jobs now, so run these jobs on Debian bookworm. Change-Id: I302e98a24646f2323da64ca506a558529da498f9 --- .zuul.yaml | 7 ++++--- bindep.txt | 9 +++++---- playbooks/zuul-stream/functional.yaml | 2 +- playbooks/zuul-stream/pre.yaml | 6 +++--- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 38ef239b47..8b745e9023 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -9,11 +9,11 @@ # need their python versions updated when these labels change to # a platform that uses a different python version. - name: controller - label: ubuntu-jammy + label: debian-bookworm - name: node1 - label: ubuntu-jammy + label: debian-bookworm - name: node2 - label: ubuntu-jammy + label: debian-bookworm groups: - name: node nodes: @@ -32,6 +32,7 @@ - zuul/ansible/.* - zuul/lib/ansible* - playbooks/zuul-stream/.* + - setup.cfg - job: name: zuul-stream-functional-6 diff --git a/bindep.txt b/bindep.txt index 2e9c5e6962..2d475c77a5 100644 --- a/bindep.txt +++ b/bindep.txt @@ -21,13 +21,14 @@ openssl-devel [compile test platform:rpm] # is an error. libressl-dev [compile test platform:apk] postgresql-dev [compile test platform:apk] -libssl1.1 [platform:debian platform:ubuntu-bionic] +libssl3 [platform:debian-bookworm] +libssl1.1 [platform:debian platform:ubuntu-bionic !platform:debian-bookworm] libssl1.0.0 [platform:ubuntu-xenial] libffi-dev [compile test platform:dpkg platform:apk] libffi [platform:apk] -libffi8 [platform:ubuntu-jammy] +libffi8 [platform:ubuntu-jammy platform:debian-bookworm] libffi7 [platform:ubuntu-focal platform:debian-bullseye] -libffi6 [platform:dpkg !platform:ubuntu-focal !platform:ubuntu-jammy !platform:debian-bullseye] +libffi6 [platform:dpkg !platform:ubuntu-focal !platform:ubuntu-jammy !platform:debian-bullseye !platform:debian-bookworm] libffi-devel [compile test platform:rpm] libyaml-0-2 [platform:dpkg platform:suse] libyaml [platform:redhat] @@ -40,7 +41,7 @@ python3-devel [compile test platform:rpm] bubblewrap [!platform:ubuntu-xenial] socat libre2-dev [compile test platform:dpkg] -libre2-9 [platform:debian-bullseye] +libre2-9 [platform:debian-bullseye platform:debian-bookworm] libre2-5 [platform:debian-buster] libre2-4 [platform:ubuntu-bionic] libre2-3 [platform:debian-stretch] diff --git a/playbooks/zuul-stream/functional.yaml b/playbooks/zuul-stream/functional.yaml index fa523f7c27..98bf7b19f6 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.10/dist-packages" + python_path: "/usr/local/lib/python3.11/dist-packages" - name: Run ansible that should succeed against testing console command: > diff --git a/playbooks/zuul-stream/pre.yaml b/playbooks/zuul-stream/pre.yaml index 9753fab850..d0763a2bd3 100644 --- a/playbooks/zuul-stream/pre.yaml +++ b/playbooks/zuul-stream/pre.yaml @@ -4,7 +4,7 @@ - role: ensure-pip - role: bindep - bindep_profile: test + bindep_profile: compile bindep_dir: src/opendev.org/zuul/zuul post_tasks: @@ -17,7 +17,7 @@ - name: Install pip shell: |+ - python3 -m pip install --upgrade pip setuptools wheel + python3 -m pip install --break-system-packages --upgrade pip setuptools wheel become: yes - name: Build wheel @@ -28,7 +28,7 @@ - name: Install software shell: |+ - python3 -m pip install src/opendev.org/zuul/zuul/dist/*.whl + python3 -m pip install --break-system-packages src/opendev.org/zuul/zuul/dist/*.whl become: yes - name: Install managed ansible versions