From e52559f527e57beae9a4e2b626169846b25ff549 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 4 May 2022 14:06:03 -0700 Subject: [PATCH] Switch py3.10 testing to Ubuntu Jammy We switch from Fedora 35 to Ubuntu Jammy for this testing because Ubuntu Jammy is an LTS release that will be supported for 5 years, but Fedora 35's total supported time period is about 13 months some of which is now gone. Depends-On: https://review.opendev.org/c/opendev/base-jobs/+/840355 Change-Id: I3025679a4747155a91e88a65dcb4f946a329fba1 --- bindep.txt | 3 ++- zuul-tests.d/project.yaml | 10 ++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/bindep.txt b/bindep.txt index aa89ce894..a740c0f63 100644 --- a/bindep.txt +++ b/bindep.txt @@ -7,4 +7,5 @@ python3-dev [test platform:dpkg platform:apk] # Required for subprocess32 python2-devel [test platform:fedora] python-devel [test platform:rpm !platform:fedora !platform:centos-8 !platform:rhel-8] -python-dev [test platform:dpkg platform:apk] +python-dev [test platform:dpkg platform:apk !platform:ubuntu-jammy] +python2-dev [test platform:ubuntu-jammy] diff --git a/zuul-tests.d/project.yaml b/zuul-tests.d/project.yaml index c9192d1a7..45cc20e5e 100644 --- a/zuul-tests.d/project.yaml +++ b/zuul-tests.d/project.yaml @@ -11,10 +11,7 @@ - tox-py39: nodeset: ubuntu-focal - tox-py310: - nodeset: - nodes: - - name: fedora-35 - label: fedora-35 + nodeset: ubuntu-jammy gate: jobs: - zuul-tox-docs @@ -23,10 +20,7 @@ - tox-py39: nodeset: ubuntu-focal - tox-py310: - nodeset: - nodes: - - name: fedora-35 - label: fedora-35 + nodeset: ubuntu-jammy promote: jobs: - zuul-promote-docs