Skip to content

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

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

Merged
juergbi merged 2 commits into from
Aug 23, 2026
+14 −11
Merged

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

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
78ffa27
ci: Add Fedora 44, remove other Fedora images
jjardon Aug 20, 2026
9bc9f84
tests: set TERM for interactive pexpect sessions
jjardon Aug 23, 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,6 +1,6 @@
# Shared common variables

CI_IMAGE_VERSION=master-2310077904
CI_IMAGE_VERSION=master-2779642792
CI_TOXENV_MAIN=py310,py311,py312,py313,py314
CI_TOXENV_PLUGINS=py310-plugins,py311-plugins,py312-plugins,py313-plugins,py314-plugins
CI_TOXENV_ALL="${CI_TOXENV_MAIN},${CI_TOXENV_PLUGINS}"
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 @@ -102,7 +102,7 @@ function runServiceTest() {


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
8 changes: 8 additions & 0 deletions tests/integration/interactive_build.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@
def build_session(integration_cache, datafiles, element_name):
project = str(datafiles)

# Interactive tests need a usable TERM so tools like click's pager (less)
# run interactively. Containers used for CI often leave TERM unset even
# when pexpect allocates a PTY.
env = os.environ.copy()
if not env.get("TERM") or env["TERM"] == "dumb":
env["TERM"] = "xterm"

# Spawn interactive session using `configured()` context manager in order
# to get the same config file as the `cli` fixture.
with runcli.configured(project, config={"sourcedir": integration_cache.sources}) as config_file:
Expand All @@ -50,6 +57,7 @@ def build_session(integration_cache, datafiles, element_name):
"build",
element_name,
],
env=env,
timeout=PEXPECT_TIMEOUT_SHORT,
)
yield session
Expand Down
Loading