Skip to content

Commit dc360ce

Browse files
authored
Merge pull request #1532 from apache/tristan/fedora34
Test in fedora 34
2 parents e20186d + e6d144d commit dc360ce

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

.github/common.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Shared common variables
22

3-
CI_IMAGE_VERSION=master-241289109
3+
CI_IMAGE_VERSION=master-359695845
44
CI_TOXENV_MAIN=py36,py37,py38-nocover,py39-nocover
55
CI_TOXENV_PLUGINS=py36-plugins,py37-plugins,py38-plugins-nocover,py39-plugins-nocover
66
CI_TOXENV_ALL="${CI_TOXENV_MAIN},${CI_TOXENV_PLUGINS}"

.github/compose/ci.docker-compose.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
version: '3.4'
22

33
x-tests-template: &tests-template
4-
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${CI_IMAGE_VERSION:-latest}
4+
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest}
55
command: tox -vvvvv -- --color=yes --integration
66
environment:
77
TOXENV: ${CI_TOXENV_ALL}
@@ -22,13 +22,14 @@ x-tests-template: &tests-template
2222

2323
services:
2424

25-
fedora-32:
26-
<<: *tests-template
27-
2825
fedora-33:
2926
<<: *tests-template
3027
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:33-${CI_IMAGE_VERSION:-latest}
3128

29+
fedora-34:
30+
<<: *tests-template
31+
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest}
32+
3233
debian-10:
3334
<<: *tests-template
3435
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-${CI_IMAGE_VERSION:-latest}

.github/run-ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ if [ -z "${test_names}" ]; then
103103
runTest "lint"
104104
runTest "mypy"
105105
runTest "debian-10"
106-
runTest "fedora-32"
107106
runTest "fedora-33"
107+
runTest "fedora-34"
108108
runTest "ubuntu-18.04"
109109
runTest "centos-7.7.1908"
110110
runTest "fedora-missing-deps"

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ jobs:
3737
# "../compose/ci.docker-compose.yml"
3838
test-name:
3939
- debian-10
40-
- fedora-32
4140
- fedora-33
41+
- fedora-34
4242
- ubuntu-18.04
4343
- centos-7.7.1908
4444
- fedora-missing-deps

0 commit comments

Comments
 (0)