Skip to content

Commit 2b2fbfb

Browse files
authored
Update CI container to Fedora-38 (#3433)
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
1 parent 6b25590 commit 2b2fbfb

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

agent/test-constraints-3.6.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Python version constraints for P3.6 testing
2+
python-daemon<3.0.0
3+
setuptools<60.0.0

jenkins/Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@ RPMBUILD_BASEIMAGE_DEFAULTS = \
2222
fedora-38 fedora-37 \
2323
centos-9 centos-8 centos-7
2424

25-
# All Fedora images are based on Fedora 36
26-
FEDORA_BASE_IMAGE_REF = quay.io/fedora/fedora:36
25+
CI_BASE_IMAGE = quay.io/fedora/fedora:38
2726

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

8887
ci.fedora.Dockerfile: ci.Dockerfile.j2
8988
jinja2 ci.Dockerfile.j2 \
90-
-D base_image_ref="${FEDORA_BASE_IMAGE_REF}" \
89+
-D base_image_ref="${CI_BASE_IMAGE}" \
9190
-D fedora=True \
9291
> $@
9392

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ allowlist_externals =
4242
description = Runs all agent unit tests under Python 3.6
4343
basepython = python3.6
4444
deps =
45+
-c{toxinidir}/agent/test-constraints-3.6.txt
4546
-r{toxinidir}/agent/requirements.txt
4647
-r{toxinidir}/agent/test-requirements.txt
4748

0 commit comments

Comments
 (0)