Update lodgeit container image to Python3.11 on Bookworm

We update the upper bound in testing from python3.10 to python3.11 to
match. This will allow the opendev team to clean up old bullseye images
and look ahead to python3.12.

Change-Id: I5321b2e75b4cf50f9342efa13fd4ef37cf87e1e0
This commit is contained in:
Clark Boylan 2023-10-09 11:20:47 -07:00
parent fd508a8c19
commit 376c2ba0d0
4 changed files with 10 additions and 9 deletions

View File

@ -20,8 +20,8 @@
description: Build OpenDev Docker images for LodgeIt description: Build OpenDev Docker images for LodgeIt
dependencies: opendev-buildset-registry dependencies: opendev-buildset-registry
requires: requires:
- python-builder-3.10-bullseye-container-image - python-builder-3.11-bookworm-container-image
- uwsgi-base-3.10-bullseye-container-image - uwsgi-base-3.11-bookworm-container-image
provides: lodgeit-container-image provides: lodgeit-container-image
vars: &lodgeit_opendev_image_vars vars: &lodgeit_opendev_image_vars
zuul_work_dir: src/opendev.org/opendev/lodgeit zuul_work_dir: src/opendev.org/opendev/lodgeit
@ -36,8 +36,8 @@
description: Build OpenDev LodgeIt Docker images and upload to Docker Hub. description: Build OpenDev LodgeIt Docker images and upload to Docker Hub.
dependencies: opendev-buildset-registry dependencies: opendev-buildset-registry
requires: requires:
- python-builder-3.10-bullseye-container-image - python-builder-3.11-bookworm-container-image
- uwsgi-base-3.10-bullseye-container-image - uwsgi-base-3.11-bookworm-container-image
provides: lodgeit-container-image provides: lodgeit-container-image
vars: *lodgeit_opendev_image_vars vars: *lodgeit_opendev_image_vars
secrets: secrets:
@ -61,7 +61,7 @@
- tox-pep8 - tox-pep8
- tox-py38: - tox-py38:
nodeset: ubuntu-focal nodeset: ubuntu-focal
- tox-py310 - tox-py311
- opendev-buildset-registry - opendev-buildset-registry
- lodgeit-build-opendev-image - lodgeit-build-opendev-image
gate: gate:
@ -69,7 +69,7 @@
- tox-pep8 - tox-pep8
- tox-py38: - tox-py38:
nodeset: ubuntu-focal nodeset: ubuntu-focal
- tox-py310 - tox-py311
- opendev-buildset-registry - opendev-buildset-registry
- lodgeit-upload-opendev-image - lodgeit-upload-opendev-image
promote: promote:

View File

@ -15,11 +15,11 @@
# Thu Dec 9 23:48:42 UTC 2021 Rebuild Timestamp # Thu Dec 9 23:48:42 UTC 2021 Rebuild Timestamp
FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder FROM docker.io/opendevorg/python-builder:3.11-bookworm as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM docker.io/opendevorg/uwsgi-base:3.10-bullseye as lodgeit FROM docker.io/opendevorg/uwsgi-base:3.11-bookworm as lodgeit
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep

View File

@ -14,6 +14,7 @@ classifier =
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.10
Programming Language :: Python :: 3.11
[entry_points] [entry_points]
wsgi_scripts = wsgi_scripts =
lodgeit-wsgi = lodgeit.application:make_app lodgeit-wsgi = lodgeit.application:make_app

View File

@ -1,6 +1,6 @@
[tox] [tox]
minversion = 1.6 minversion = 1.6
envlist = pep8, py38, py310 envlist = pep8, py38, py311
skipsdist = True skipsdist = True
[testenv] [testenv]