opendev
/
system-config
Code Issues Proposed changes

Update python builder and base image 

It is a good idea ot periodically update our base python images. Now is
a good time to do it as we've got debian bullseye updates and python
minor releases. The bullseye updates fix a glibc bug that was affecting
Ansible in the zuul images. With this update we'll be able to remove the
workaround for that issue.

We also update the builder image's apt-get process to include a clean to
match tbe base image. This is more for consistency than anything else.

Finally update job timeouts for builds as it seems we occasionally need
more time particularly for emulated arm64 builds.

Change-Id: I31483ff434f19f408aef3b63cb2cd24044a8bf29
This commit is contained in:
Clark Boylan 2022-09-08 08:33:28 -07:00
parent 9313c8e879
commit 970d5f6a06
5 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/python-base/Dockerfile
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Comment to force rebuilds Tue Aug 3 19:59:32 UTC 2021
# Comment to force rebuilds Thu Sep 8 15:32:47 UTC 2022
ARG PYTHON_VERSION=3.10
ARG DEBIAN_VERSION=bullseye

3
docker/python-builder/Dockerfile
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Comment to force rebuilds Tue Aug 3 19:59:32 UTC 2021
# Comment to force rebuilds Thu Sep 8 15:32:47 UTC 2022
ARG PYTHON_VERSION=3.10
ARG DEBIAN_VERSION=bullseye
@ -22,6 +22,7 @@ FROM docker.io/library/python:${PYTHON_VERSION}-slim-${DEBIAN_VERSION} as fake-p
WORKDIR /tmp
RUN apt-get update \
&& apt-get install -y curl equivs \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
COPY python3-dev.control /tmp/python3-dev.control
RUN equivs-build /tmp/python3-dev.control

6
zuul.d/docker-images/python-3.10-bullseye.yaml
View File

@ -3,6 +3,7 @@
name: system-config-build-image-python-builder-3.10-bullseye
description: Build a python-builder-3.10-bullseye image.
parent: system-config-build-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.10-bullseye-container-image
@ -26,6 +27,7 @@
name: system-config-upload-image-python-builder-3.10-bullseye
description: Build and upload a python-builder-3.10-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.10-bullseye-container-image
@ -43,6 +45,7 @@
name: system-config-build-image-python-base-3.10-bullseye
description: Build a python-base-3.10-bullseye image.
parent: system-config-build-image
timeout: 3600
provides:
- python-base-container-image
- python-base-3.10-container-image
@ -66,6 +69,7 @@
name: system-config-upload-image-python-base-3.10-bullseye
description: Build and upload a python-base-3.10-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides: python-base-3.10-bullseye-container-image
vars: *python-base_3_10_bullseye_vars
files: *python-base_3_10_bullseye_files
@ -81,6 +85,7 @@
name: system-config-build-image-uwsgi-base-3.10-bullseye
description: Build a uwsgi-base-3.10-bullseye image.
parent: system-config-build-image
timeout: 3600
requires: &uwsgi-base_3_10_bullseye_requires
- python-base-3.10-bullseye-container-image
- python-builder-3.10-bullseye-container-image
@ -111,6 +116,7 @@
name: system-config-upload-image-uwsgi-base-3.10-bullseye
description: Build and upload a uwsgi-base-3.10-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides: uwsgi-base-3.10-bullseye-container-image
requires: *uwsgi-base_3_10_bullseye_requires
dependencies:

6
zuul.d/docker-images/python-3.8-bullseye.yaml
View File

@ -3,6 +3,7 @@
name: system-config-build-image-python-builder-3.8-bullseye
description: Build a python-builder-3.8-bullseye image.
parent: system-config-build-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.8-bullseye-container-image
@ -26,6 +27,7 @@
name: system-config-upload-image-python-builder-3.8-bullseye
description: Build and upload a python-builder-3.8-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.8-bullseye-container-image
@ -43,6 +45,7 @@
name: system-config-build-image-python-base-3.8-bullseye
description: Build a python-base-3.8-bullseye image.
parent: system-config-build-image
timeout: 3600
provides:
- python-base-container-image
- python-base-3.8-container-image
@ -66,6 +69,7 @@
name: system-config-upload-image-python-base-3.8-bullseye
description: Build and upload a python-base-3.8-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides: python-base-3.8-bullseye-container-image
vars: *python-base_3_8_bullseye_vars
files: *python-base_3_8_bullseye_files
@ -81,6 +85,7 @@
name: system-config-build-image-uwsgi-base-3.8-bullseye
description: Build a uwsgi-base-3.8-bullseye image.
parent: system-config-build-image
timeout: 3600
requires: &uwsgi-base_3_8_bullseye_requires
- python-base-3.8-bullseye-container-image
- python-builder-3.8-bullseye-container-image
@ -111,6 +116,7 @@
name: system-config-upload-image-uwsgi-base-3.8-bullseye
description: Build and upload a uwsgi-base-3.8-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides: uwsgi-base-3.8-bullseye-container-image
requires: *uwsgi-base_3_8_bullseye_requires
dependencies:

6
zuul.d/docker-images/python-3.9-bullseye.yaml
View File

@ -3,6 +3,7 @@
name: system-config-build-image-python-builder-3.9-bullseye
description: Build a python-builder-3.9-bullseye image.
parent: system-config-build-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.9-bullseye-container-image
@ -26,6 +27,7 @@
name: system-config-upload-image-python-builder-3.9-bullseye
description: Build and upload a python-builder-3.9-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides:
- python-builder-container-image
- python-builder-3.9-bullseye-container-image
@ -43,6 +45,7 @@
name: system-config-build-image-python-base-3.9-bullseye
description: Build a python-base-3.9-bullseye image.
parent: system-config-build-image
timeout: 3600
provides:
- python-base-container-image
- python-base-3.9-container-image
@ -66,6 +69,7 @@
name: system-config-upload-image-python-base-3.9-bullseye
description: Build and upload a python-base-3.9-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides: python-base-3.9-bullseye-container-image
vars: *python-base_3_9_bullseye_vars
files: *python-base_3_9_bullseye_files
@ -81,6 +85,7 @@
name: system-config-build-image-uwsgi-base-3.9-bullseye
description: Build a uwsgi-base-3.9-bullseye image.
parent: system-config-build-image
timeout: 3600
requires: &uwsgi-base_3_9_bullseye_requires
- python-base-3.9-bullseye-container-image
- python-builder-3.9-bullseye-container-image
@ -111,6 +116,7 @@
name: system-config-upload-image-uwsgi-base-3.9-bullseye
description: Build and upload a uwsgi-base-3.9-bullseye image.
parent: system-config-upload-image
timeout: 3600
provides: uwsgi-base-3.9-bullseye-container-image
requires: *uwsgi-base_3_9_bullseye_requires
dependencies: