summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClark Boylan <clark.boylan@gmail.com>2022-10-25 08:55:34 -0700
committerClark Boylan <clark.boylan@gmail.com>2022-10-27 16:47:14 -0700
commit9b2b8f82ff298f7f12bce68ce57ba09a2a66da12 (patch)
treef51a875d6f15ad258ba3a7c9d22ae4ff6bdf3183
parentb70d8de85bcfd551fa55b2a865ad86c494790de0 (diff)
downloadzuul-9b2b8f82ff298f7f12bce68ce57ba09a2a66da12.tar.gz
Add Python 3.11 testing
This adds python 3.11 testing and drops python3.10 in order to keep testing only the bounds of what Zuul supports. Note that currently the python 3.11 available for jammy is based on an RC release. This should be fine as we do functional testing with a released python 3.11 and that is what people will consume via the docker images. Change-Id: Ic5ecf2e23b250d3dbf592983b17ec715d6e9722e
-rw-r--r--.zuul.yaml24
-rw-r--r--Dockerfile4
-rw-r--r--setup.cfg1
3 files changed, 15 insertions, 14 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 1a411c6d3..66a3de1e3 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -88,12 +88,12 @@
tox_envlist: zuul_client
- job:
- name: zuul-tox-py310
+ name: zuul-tox-py311
parent: zuul-tox
timeout: 7200 # 120 minutes
vars:
- tox_envlist: py310
- python_version: "3.10"
+ tox_envlist: py311
+ python_version: "3.11"
- job:
name: zuul-tox-py38
@@ -105,8 +105,8 @@
nodeset: ubuntu-focal
- job:
- name: zuul-tox-py310-multi-scheduler
- parent: zuul-tox-py310
+ name: zuul-tox-py311-multi-scheduler
+ parent: zuul-tox-py311
voting: false
vars:
tox_environment:
@@ -200,8 +200,8 @@
allowed-projects: zuul/zuul
timeout: 2700 # 45 minutes
requires:
- - python-builder-3.10-bullseye-container-image
- - python-base-3.10-bullseye-container-image
+ - python-builder-3.11-bullseye-container-image
+ - python-base-3.11-bullseye-container-image
provides: zuul-container-image
vars: &zuul_image_vars
docker_images:
@@ -239,8 +239,8 @@
description: Build Docker images and upload to Docker Hub.
allowed-projects: zuul/zuul
requires:
- - python-builder-3.10-bullseye-container-image
- - python-base-3.10-bullseye-container-image
+ - python-builder-3.11-bullseye-container-image
+ - python-base-3.11-bullseye-container-image
provides: zuul-container-image
secrets:
name: docker_credentials
@@ -287,8 +287,8 @@
tox_install_bindep: false
nodeset: ubuntu-jammy
- zuul-tox-py38
- - zuul-tox-py310
- - zuul-tox-py310-multi-scheduler
+ - zuul-tox-py311
+ - zuul-tox-py311-multi-scheduler
- zuul-build-dashboard-openstack-whitelabel
- zuul-build-dashboard-software-factory
- zuul-build-dashboard-opendev
@@ -318,7 +318,7 @@
tox_install_bindep: false
nodeset: ubuntu-jammy
- zuul-tox-py38
- - zuul-tox-py310
+ - zuul-tox-py311
- zuul-build-dashboard
- nodejs-run-lint:
vars:
diff --git a/Dockerfile b/Dockerfile
index c6cc17651..506ed7462 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,7 +19,7 @@ COPY web /tmp/src
# Explicitly run the Javascript build
RUN cd /tmp/src && yarn install -d && yarn build
-FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
+FROM docker.io/opendevorg/python-builder:3.11-bullseye as builder
ENV DEBIAN_FRONTEND=noninteractive
# Optional location of Zuul API endpoint.
@@ -48,7 +48,7 @@ RUN /output/install-from-bindep \
&& echo $OPENSHIFT_SHA /tmp/openshift-install/openshift-client.tgz | sha256sum --check \
&& tar xvfz openshift-client.tgz --strip-components=1 -C /tmp/openshift-install
-FROM docker.io/opendevorg/python-base:3.10-bullseye as zuul
+FROM docker.io/opendevorg/python-base:3.11-bullseye as zuul
ENV DEBIAN_FRONTEND=noninteractive
COPY --from=builder /output/ /output
diff --git a/setup.cfg b/setup.cfg
index 74905bf6c..79157c9ed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@ classifier =
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
+ Programming Language :: Python :: 3.11
[pbr]
warnerrors = True