Skip to content

Commit

Permalink
Update CI container to Fedora-38 (#3433)
Browse files Browse the repository at this point in the history
Update the default container image used by `jenkins/run` to F38
Add constraints to the Py36 legacy test environment for `python-daemon` and `setuptools`.

PBENCH-1161
  • Loading branch information
webbnh authored Jun 2, 2023
1 parent 6b25590 commit 2b2fbfb
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 3 additions & 0 deletions agent/test-constraints-3.6.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Python version constraints for P3.6 testing
python-daemon<3.0.0
setuptools<60.0.0
5 changes: 2 additions & 3 deletions jenkins/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ RPMBUILD_BASEIMAGE_DEFAULTS = \
fedora-38 fedora-37 \
centos-9 centos-8 centos-7

# All Fedora images are based on Fedora 36
FEDORA_BASE_IMAGE_REF = quay.io/fedora/fedora:36
CI_BASE_IMAGE = quay.io/fedora/fedora:38

# Templates for the various distributions' base images. For the moment, for a
# given distribution, all of the versions can be found by tweaking the image
Expand Down Expand Up @@ -87,7 +86,7 @@ ${_DISTROS:%=image-rpmbuild-%}: image-rpmbuild-%:

ci.fedora.Dockerfile: ci.Dockerfile.j2
jinja2 ci.Dockerfile.j2 \
-D base_image_ref="${FEDORA_BASE_IMAGE_REF}" \
-D base_image_ref="${CI_BASE_IMAGE}" \
-D fedora=True \
> $@

Expand Down
1 change: 1 addition & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ allowlist_externals =
description = Runs all agent unit tests under Python 3.6
basepython = python3.6
deps =
-c{toxinidir}/agent/test-constraints-3.6.txt
-r{toxinidir}/agent/requirements.txt
-r{toxinidir}/agent/test-requirements.txt

Expand Down

0 comments on commit 2b2fbfb

Please sign in to comment.