Convert container to Bookworm + Python3.11

This matches what Zuul and Nodepool are doing. Getting off the older
images will alos allow OpenDev to stop building them. We update the
unittest job to python 3.11 in the process to better cover what people
will deploy.

Change-Id: I906bc33eb60119ab7544d8c16a81cbcd0ed5e8fd
This commit is contained in:
Clark Boylan 2023-09-21 08:13:56 -07:00
parent 9e72780811
commit 687d902c1e
2 changed files with 8 additions and 8 deletions

View File

@ -33,8 +33,8 @@
allowed-projects: zuul/zuul-client
timeout: 2700
requires:
- python-builder-3.10-bullseye-container-image
- python-base-3.10-bullseye-container-image
- python-builder-3.11-bookworm-container-image
- python-base-3.11-bookworm-container-image
provides:
- zuul-client-container-image
vars: &zuulclient_image_vars
@ -54,8 +54,8 @@
description: Build the CLI container image and upload to the registry.
timeout: 3600
requires:
- python-builder-3.10-bullseye-container-image
- python-base-3.10-bullseye-container-image
- python-builder-3.11-bookworm-container-image
- python-base-3.11-bookworm-container-image
provides: zuul-client-container-image
vars: *zuulclient_image_vars
secrets:
@ -87,7 +87,7 @@
- nox-py38:
nodeset: ubuntu-focal
timeout: 3600
- nox-py310:
- nox-py311:
nodeset: ubuntu-jammy
timeout: 3600
- zuul-nox-zuul-client
@ -101,7 +101,7 @@
- nox-py38:
nodeset: ubuntu-focal
timeout: 3600
- nox-py310:
- nox-py311:
nodeset: ubuntu-jammy
timeout: 3600
- zuul-nox-zuul-client

View File

@ -13,12 +13,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
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
RUN assemble
FROM docker.io/opendevorg/python-base:3.10-bullseye
FROM docker.io/opendevorg/python-base:3.11-bookworm
COPY --from=builder /output/ /output
RUN /output/install-from-bindep