Update Docker images to python 3.10

This updates the grafyaml docker images to python 3.10. We do this
because 3.10 has been shown to be quicker than 3.8. Also, 3.11 is coming
up soon and moving off of 3.8 will allow us to remove those images
before adding 3.11 which keeps to image build count to a more reasonable
number.

We update the voluptuous version to add python 3.10 support. In
particular collections.Mapping moved to collections.abc.Mapping.

Change-Id: I1514f5e1992cfe5dcdaa06133f5da7379599e57e
This commit is contained in:
Clark Boylan 2022-10-14 14:31:18 -07:00
parent 7f9c7fdee2
commit ddd1845d00
4 changed files with 12 additions and 9 deletions

View File

@ -21,8 +21,8 @@
allowed-projects: opendev/grafyaml allowed-projects: opendev/grafyaml
timeout: 2700 timeout: 2700
requires: requires:
- python-builder-3.8-container-image - python-builder-3.10-bullseye-container-image
- python-base-3.8-container-image - python-base-3.10-bullseye-container-image
provides: provides:
- grafyaml-container-image - grafyaml-container-image
dependencies: dependencies:
@ -40,8 +40,8 @@
description: Build the grafyaml Docker image and upload to Docker Hub. description: Build the grafyaml Docker image and upload to Docker Hub.
timeout: 3600 timeout: 3600
requires: requires:
- python-builder-3.8-container-image - python-builder-3.10-bullseye-container-image
- python-base-3.8-container-image - python-base-3.10-bullseye-container-image
provides: grafyaml-container-image provides: grafyaml-container-image
vars: *grafyaml_image_vars vars: *grafyaml_image_vars
secrets: secrets:
@ -65,14 +65,16 @@
check: check:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38 - tox-py310:
nodeset: ubuntu-jammy
- opendev-buildset-registry - opendev-buildset-registry
- grafyaml-build-image - grafyaml-build-image
- project-config-grafana - project-config-grafana
gate: gate:
jobs: jobs:
- tox-pep8 - tox-pep8
- tox-py38 - tox-py310:
nodeset: ubuntu-jammy
- grafyaml-upload-image - grafyaml-upload-image
promote: promote:
jobs: jobs:

View File

@ -14,12 +14,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM docker.io/opendevorg/python-builder:3.8 as builder FROM docker.io/opendevorg/python-builder:3.10-bullseye as builder
COPY . /tmp/src COPY . /tmp/src
RUN assemble RUN assemble
FROM docker.io/opendevorg/python-base:3.8 FROM docker.io/opendevorg/python-base:3.10-bullseye
COPY --from=builder /output/ /output COPY --from=builder /output/ /output
RUN /output/install-from-bindep RUN /output/install-from-bindep

View File

@ -4,4 +4,4 @@ python-slugify
PyYAML>=3.1.0 PyYAML>=3.1.0
requests requests
six>=1.6.0 six>=1.6.0
voluptuous>0.10.5 voluptuous>=0.13.1

View File

@ -21,6 +21,7 @@ classifier =
Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.6
Programming Language :: Python :: 3.7 Programming Language :: Python :: 3.7
Programming Language :: Python :: 3.8 Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.10
Topic :: Utilities Topic :: Utilities
[files] [files]