Skip to content

ci: Add Fedora 44, remove other Fedora images #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
jjardon wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

ci: Add Fedora 44, remove other Fedora images #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73c7c85
ci: Add Fedora 44, remove other Fedora images
jjardon Aug 28, 2026
7c4c05b
tests: put setuptools on the mock file:// PyPI index
jjardon Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/common.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Shared common variables

CI_IMAGE_VERSION=master-2310077904
CI_IMAGE_VERSION=master-2779642792
CI_TOXENV_ALL=py310,py311,py312,py313,py314
CI_TOXENV_MASTER=py310-bst-master,py311-bst-master,py312-bst-master,py313-bst-master,py314-bst-master
10 changes: 3 additions & 7 deletions .github/compose/ci.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: '3.4'

x-tests-template: &tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:42-${CI_IMAGE_VERSION:-latest}
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:44-${CI_IMAGE_VERSION:-latest}
command: tox -vvvvv -- --color=yes --integration
environment:
TOXENV: ${CI_TOXENV_ALL}
Expand Down Expand Up @@ -30,13 +30,9 @@ services:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:13-${CI_IMAGE_VERSION:-latest}

fedora-42:
fedora-44:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:42-${CI_IMAGE_VERSION:-latest}

fedora-43:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:43-${CI_IMAGE_VERSION:-latest}
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:44-${CI_IMAGE_VERSION:-latest}

ubuntu-22.04:
<<: *tests-template
Expand Down
2 changes: 1 addition & 1 deletion .github/run-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ function runTest() {


if [ -z "${test_names}" ]; then
for test_name in "mypy debian-12 debian-13 fedora-42 fedora-43 fedora-missing-deps ubuntu-22.04"; do
for test_name in "mypy debian-12 debian-13 fedora-44 fedora-missing-deps ubuntu-22.04"; do
if ! runTest "${test_name}"; then
echo "Tests failed"
exit 1
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ jobs:
test-name:
- debian-12
- debian-13
- fedora-42
- fedora-43
- fedora-44
- fedora-missing-deps
- ubuntu-22.04
- lint
Expand Down
28 changes: 28 additions & 0 deletions tests/testutils/python_repo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,5 +144,33 @@ def add_packages(packages, pypi_repo):
)
for dependency, dependency_dependencies in dependencies.items():
add_packages({dependency: dependency_dependencies}, pypi_repo)
_add_setuptools(pypi_repo)

return add_packages


def _add_setuptools(pypi_repo):
# pip 25 isolate-builds sdists and resolves setuptools from --index-url.
# --no-binary :all: is inherited, so this must be an sdist.
dest = os.path.join(pypi_repo, "setuptools")
if os.path.isdir(dest) and os.listdir(dest):
return
os.makedirs(dest, exist_ok=True)
subprocess.run(
[
sys.executable,
"-m",
"pip",
"download",
"setuptools>=40.8.0",
"--dest",
dest,
"--no-deps",
"--no-binary",
":all:",
],
check=True,
)
links = "".join(HTML_LINK_TEMPLATE.format(dist=name) for name in sorted(os.listdir(dest)) if name != "index.html")
with open(os.path.join(dest, "index.html"), "w", encoding="utf-8") as handle:
handle.write(HTML_TEMPLATE.format(name="setuptools", links=links))