This is an automated email from the ASF dual-hosted git repository. juergbi pushed a commit to branch jbilleter/docker-images in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 3c93b8cde75f44da6e7306651a7a8c583653a5e7 Author: Jürg Billeter <[email protected]> AuthorDate: Fri Jun 13 17:35:30 2025 +0200 wip: ci: Update images Drop Fedora 40, add Fedora 42, and update BuildBox to 1.3.21. https://gitlab.com/BuildStream/buildstream-docker-images/-/merge_requests/230 --- .github/common.env | 2 +- .github/compose/ci.docker-compose.yml | 6 +++--- .github/run-ci.sh | 2 +- .github/workflows/ci.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/common.env b/.github/common.env index ff3ba4315..88e5a2019 100644 --- a/.github/common.env +++ b/.github/common.env @@ -1,6 +1,6 @@ # Shared common variables -CI_IMAGE_VERSION=master-1558808360 +CI_IMAGE_VERSION=jbilleter-fedora-1867201540 CI_TOXENV_MAIN=py39,py310,py311,py312,py313 CI_TOXENV_PLUGINS=py39-plugins,py310-plugins,py311-plugins,py312-plugins,py313-plugins CI_TOXENV_ALL="${CI_TOXENV_MAIN},${CI_TOXENV_PLUGINS}" diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 49a1b0705..d4f4b2d53 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -1,7 +1,7 @@ version: '3.4' x-tests-template: &tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest} command: tox -vvvvv -- --color=yes --integration environment: TOXENV: ${CI_TOXENV_ALL} @@ -28,11 +28,11 @@ services: fedora-40: <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:40-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest} fedora-41: <<: *tests-template - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:41-${CI_IMAGE_VERSION:-latest} + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:42-${CI_IMAGE_VERSION:-latest} ubuntu-22.04: <<: *tests-template diff --git a/.github/run-ci.sh b/.github/run-ci.sh index 7e7fe8bb2..173cfcdb4 100755 --- a/.github/run-ci.sh +++ b/.github/run-ci.sh @@ -102,7 +102,7 @@ function runServiceTest() { if [ -z "${test_names}" ]; then - for test_name in mypy debian-11 fedora-40 fedora-41 fedora-missing-deps ubuntu-22.04; do + for test_name in mypy debian-11 fedora-41 fedora-42 fedora-missing-deps ubuntu-22.04; do if ! runTest "${test_name}"; then echo "Tests failed" exit 1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 266b1cbec..007deddd6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,8 +37,8 @@ jobs: # "../compose/ci.docker-compose.yml" test-name: - debian-11 - - fedora-40 - fedora-41 + - fedora-42 - fedora-missing-deps - ubuntu-22.04 - lint
