Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Shared common variables

CI_IMAGE_VERSION=master-241289109
CI_IMAGE_VERSION=master-359695845
CI_TOXENV_MAIN=py36-nocover,py37-nocover,py38-nocover,py39-nocover
CI_TOXENV_ALL="${CI_TOXENV_MAIN}"
10 changes: 3 additions & 7 deletions .github/compose/ci.docker-compose.yml
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:32-${CI_IMAGE_VERSION:-latest}
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest}
command: tox -vvvvv -- --color=yes --integration -n 4
environment:
TOXENV: ${CI_TOXENV_ALL}
Expand All @@ -22,13 +22,9 @@ x-tests-template: &tests-template

services:

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

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

debian-10:
<<: *tests-template
Expand Down
3 changes: 1 addition & 2 deletions .github/run-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,7 @@ set -x
if [ -z "${test_names}" ]; then
runTest "lint"
runTest "debian-10"
runTest "fedora-32"
runTest "fedora-33"
runTest "fedora-34"
runTest "ubuntu-18.04"
runTest "centos-7.7.1908"
else
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ jobs:
# "../compose/ci.docker-compose.yml"
test-name:
- debian-10
- fedora-32
- fedora-33
- fedora-34
- ubuntu-18.04
- centos-7.7.1908
- lint
Expand Down