Update ptgbot to python3.11 and Bookworm

We update python testing from python3.8 to python3.11 to match the
deployment setup in the Docker image. We then update the docker image
from python3.9 + bullseye to python3.11 + bookworm. This is future
proofing, but also OpenDev would like to clean up old docker container
image builds for bullseye and older python.

Change-Id: Ifbb7dcf2bf5f0b7ea4f53e26dd4bf4911c9b8d37
This commit is contained in:
Clark Boylan 2023-09-19 10:42:21 -07:00
parent 70838b9d93
commit 513944afea
4 changed files with 13 additions and 17 deletions

View File

@ -19,8 +19,8 @@
parent: opendev-build-docker-image parent: opendev-build-docker-image
description: Build OpenDev Docker images for statusbot description: Build OpenDev Docker images for statusbot
requires: requires:
- python-builder-3.9-bullseye-container-image - python-builder-3.11-bookworm-container-image
- python-base-3.9-bullseye-container-image - python-base-3.11-bookworm-container-image
provides: ptgbot-container-image provides: ptgbot-container-image
vars: &ptgbot_opendev_image_vars vars: &ptgbot_opendev_image_vars
zuul_work_dir: src/opendev.org/openstack/ptgbot zuul_work_dir: src/opendev.org/openstack/ptgbot
@ -34,8 +34,8 @@
parent: opendev-upload-docker-image parent: opendev-upload-docker-image
description: Build OpenDev statusbot Docker images and upload to Docker Hub. description: Build OpenDev statusbot Docker images and upload to Docker Hub.
requires: requires:
- python-builder-3.9-bullseye-container-image - python-builder-3.11-bookworm-container-image
- python-base-3.9-bullseye-container-image - python-base-3.11-bookworm-container-image
provides: ptgbot-container-image provides: ptgbot-container-image
vars: *ptgbot_opendev_image_vars vars: *ptgbot_opendev_image_vars
secrets: secrets:
@ -56,14 +56,14 @@
check: check:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38: - tox-py311:
nodeset: ubuntu-focal nodeset: ubuntu-jammy
- ptgbot-build-opendev-image - ptgbot-build-opendev-image
gate: gate:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38: - tox-py311:
nodeset: ubuntu-focal nodeset: ubuntu-jammy
- ptgbot-upload-opendev-image - ptgbot-upload-opendev-image
promote: promote:
jobs: jobs:

View File

@ -1,10 +1,10 @@
FROM docker.io/opendevorg/python-builder:3.9-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/python-base:3.9-bullseye as ptgbot FROM docker.io/opendevorg/python-base:3.11-bookworm as ptgbot
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep

View File

@ -603,13 +603,13 @@ class TestProcessMessage(testtools.TestCase):
self.bot.on_pubmsg() self.bot.on_pubmsg()
mock_send.assert_called_with( mock_send.assert_called_with(
'#channel', '#channel',
"Bot airbag activated: on_pubmsg() " "Bot airbag activated: PTGBot.on_pubmsg() "
"missing 2 required positional arguments: 'c' and 'e'" "missing 2 required positional arguments: 'c' and 'e'"
) )
mock_send.reset_mock() mock_send.reset_mock()
self.bot.on_privmsg() self.bot.on_privmsg()
mock_send.assert_called_with( mock_send.assert_called_with(
'#channel', '#channel',
"Bot airbag activated: on_privmsg() " "Bot airbag activated: PTGBot.on_privmsg() "
"missing 2 required positional arguments: 'c' and 'e'" "missing 2 required positional arguments: 'c' and 'e'"
) )

View File

@ -13,11 +13,7 @@ classifier =
Operating System :: POSIX :: Linux Operating System :: POSIX :: Linux
Programming Language :: Python Programming Language :: Python
Programming Language :: Python :: 3 Programming Language :: Python :: 3
Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
[files] [files]
packages = packages =