Bump container from python3.10 to python3.11

This matches what Zuul and Nodepool are doing. Getting off the older
images will also 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.

Note we wanted to update the base OS from bullseye to bookworm, but this
update involves upgrading openssl from 1.1.x to 3.x and the rehash
library which the registry depends on is not compatible with openssl
3.x. Getting to python3.11 on bullseye would at least allow us to stop
building python3.9 and python3.10 bullseye images.

Change-Id: Ie609a2f5f3c488cea8d98e78c9fa6353ebb78f62
This commit is contained in:
Clark Boylan 2023-09-21 08:42:19 -07:00
parent ce6722d215
commit 78dd1225ba
2 changed files with 8 additions and 8 deletions

View File

@ -35,8 +35,8 @@
run: playbooks/functional-test/run.yaml
post-run: playbooks/functional-test/post.yaml
requires:
- python-builder-3.10-bullseye-container-image
- python-base-3.10-bullseye-container-image
- python-builder-3.11-bullseye-container-image
- python-base-3.11-bullseye-container-image
provides: zuul-registry-container-image
nodeset: ubuntu-jammy
vars: &image_vars
@ -66,8 +66,8 @@
secret: zuul-registry-registry-credentials
pass-to-parent: true
requires:
- python-builder-3.10-bullseye-container-image
- python-base-3.10-bullseye-container-image
- python-builder-3.11-bullseye-container-image
- python-base-3.11-bullseye-container-image
provides: zuul-registry-container-image
vars: *image_vars
@ -93,7 +93,7 @@
- nox-linters
- nox-py38:
nodeset: ubuntu-focal
- nox-py310:
- nox-py311:
nodeset: ubuntu-jammy
- build-python-release
gate:
@ -102,7 +102,7 @@
- nox-linters
- nox-py38:
nodeset: ubuntu-focal
- nox-py310:
- nox-py311:
nodeset: ubuntu-jammy
- build-python-release
promote:

View File

@ -13,12 +13,12 @@
# You should have received a copy of the GNU General Public License
# 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-bullseye as builder
COPY . /tmp/src
RUN assemble
FROM docker.io/opendevorg/python-base:3.10-bullseye as zuul-registry
FROM docker.io/opendevorg/python-base:3.11-bullseye as zuul-registry
COPY --from=builder /output/ /output
RUN /output/install-from-bindep