zuul/zuul-client
Code Issues Proposed changes

Update docker images to python 3.10

Browse Source 
We do this for two reasons. The first is that Zuul proper has shown
python 3.10 is a bit quicker than 3.8 and we should take advantage of
that. The second is OpenDev would like to drop image builds for python
3.8 to make room for the upcoming release of python 3.11.

Note we add python 3.10 testing to ensure we don't regress the images by
making this change.

Change-Id: I3630c376cef775ce622618bf5f6e59cf62c4f492
This commit is contained in:
Clark Boylan 2022-10-14 14:41:47 -07:00
parent 3bea871197
commit aca007e908
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.zuul.yaml
View File

@ -21,8 +21,8 @@
allowed-projects: zuul/zuul-client allowed-projects: zuul/zuul-client
timeout: 2700 timeout: 2700
requires: requires:
- python-builder-3.8-bullseye-container-image - python-builder-3.10-bullseye-container-image
- python-base-3.8-bullseye-container-image - python-base-3.10-bullseye-container-image
provides: provides:
- zuul-client-container-image - zuul-client-container-image
vars: &zuulclient_image_vars vars: &zuulclient_image_vars
@ -38,8 +38,8 @@
description: Build the CLI Docker image and upload to Docker Hub. description: Build the CLI Docker image and upload to Docker Hub.
timeout: 3600 timeout: 3600
requires: requires:
- python-builder-3.8-bullseye-container-image - python-builder-3.10-bullseye-container-image
- python-base-3.8-bullseye-container-image - python-base-3.10-bullseye-container-image
provides: zuul-client-container-image provides: zuul-client-container-image
vars: *zuulclient_image_vars vars: *zuulclient_image_vars
secrets: secrets:
@ -74,6 +74,9 @@
- tox-py38: - tox-py38:
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
timeout: 3600 timeout: 3600
- tox-py310:
nodeset: ubuntu-jammy
timeout: 3600
- zuul-tox-zuul-client - zuul-tox-zuul-client
- build-python-release - build-python-release
gate: gate:
@ -88,6 +91,9 @@
- tox-py38: - tox-py38:
nodeset: ubuntu-bionic nodeset: ubuntu-bionic
timeout: 3600 timeout: 3600
- tox-py310:
nodeset: ubuntu-jammy
timeout: 3600
- zuul-tox-zuul-client - zuul-tox-zuul-client
- build-python-release - build-python-release
- zuul-client-upload-image - zuul-client-upload-image

4
Dockerfile
View File

@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM docker.io/opendevorg/python-builder:3.8-bullseye as builder FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM docker.io/opendevorg/python-base:3.8-bullseye FROM docker.io/opendevorg/python-base:3.10-bullseye
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep

1
setup.cfg
View File

@ -30,6 +30,7 @@ classifier =
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9 Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3 :: Only Programming Language :: Python :: 3 :: Only
Topic :: Software Development :: Quality Assurance Topic :: Software Development :: Quality Assurance
Topic :: Software Development :: Testing Topic :: Software Development :: Testing