Update Gerrit bot to python3.11 on bookworm

This drops python3.8 and python3.10 testing focusing only on python3.11.
At the same time we bump the container image to python3.11 and bookworm.

The eventual goal here is to have opendev services on bookworm and
python3.11 so that we can drop docker image builds for bullseye and
older python versions.

Change-Id: I37b2ed3fafb3599db95730f3a9bbb90da95ff0e4
This commit is contained in:
Clark Boylan 2023-09-19 10:27:47 -07:00
parent d4758daf51
commit 738a671459
4 changed files with 10 additions and 15 deletions

View File

@ -20,8 +20,8 @@
description: Build OpenDev Docker images for storyboard webclient description: Build OpenDev Docker images for storyboard webclient
provides: gerritbot-container-image provides: gerritbot-container-image
requires: requires:
- python-builder-3.10-bullseye-container-image - python-builder-3.11-bookworm-container-image
- python-base-3.10-bullseye-container-image - python-base-3.11-bookworm-container-image
required-projects: &gerritbot_opendev_required_projects required-projects: &gerritbot_opendev_required_projects
- opendev/gerritlib - opendev/gerritlib
vars: &gerritbot_opendev_image_vars vars: &gerritbot_opendev_image_vars
@ -39,8 +39,8 @@
description: Build OpenDev gerritbot Docker images and upload to Docker Hub. description: Build OpenDev gerritbot Docker images and upload to Docker Hub.
provides: gerritbot-container-image provides: gerritbot-container-image
requires: requires:
- python-builder-3.10-bullseye-container-image - python-builder-3.11-bookworm-container-image
- python-base-3.10-bullseye-container-image - python-base-3.11-bookworm-container-image
required-projects: *gerritbot_opendev_required_projects required-projects: *gerritbot_opendev_required_projects
vars: *gerritbot_opendev_image_vars vars: *gerritbot_opendev_image_vars
secrets: secrets:
@ -62,17 +62,13 @@
check: check:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38: - tox-py311:
nodeset: ubuntu-focal
- tox-py310:
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
- gerritbot-build-opendev-image - gerritbot-build-opendev-image
gate: gate:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38: - tox-py311:
nodeset: ubuntu-focal
- tox-py310:
nodeset: ubuntu-jammy nodeset: ubuntu-jammy
- gerritbot-upload-opendev-image - gerritbot-upload-opendev-image
promote: promote:

View File

@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this software. If not, see <http://www.gnu.org/licenses/>. # along with this software. If not, see <http://www.gnu.org/licenses/>.
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/python-base:3.10-bullseye as gerritbot FROM docker.io/opendevorg/python-base:3.11-bookworm as gerritbot
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep

View File

@ -13,8 +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.8 Programming Language :: Python :: 3.11
Programming Language :: Python :: 3.10
[entry_points] [entry_points]
console_scripts = console_scripts =

View File

@ -1,5 +1,5 @@
[tox] [tox]
envlist = py310,py38,pep8 envlist = py311,pep8
[testenv] [testenv]
usedevelop = True usedevelop = True