summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2020-04-04 15:58:33 +0100
committerJavier Jardón <jjardon@gnome.org>2020-04-04 16:07:26 +0100
commit68e3c75fcb50376cff66ffc8928d1ef1213cec84 (patch)
treefe4c67b0f4bf81f322c01adfc998f3f3d676b06a
parent506e1723efc0afbd09361df3c050c88201fdd268 (diff)
downloadbuildstream-68e3c75fcb50376cff66ffc8928d1ef1213cec84.tar.gz
Use current stable fedora 31 for tests
-rw-r--r--.gitlab-ci.yml14
1 files changed, 5 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 840d1fe94..ad547822a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,7 @@ stages:
- post
variables:
+ DOCKER_IMAGE_VERSION: master-132813612
INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
TEST_COMMAND: "tox -- --color=yes --integration"
COVERAGE_PREFIX: "${CI_JOB_NAME}."
@@ -50,12 +51,8 @@ tests-debian-9:
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:9-master-55318540
<<: *tests
-tests-fedora-29:
- image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-55318540
- <<: *tests
-
-tests-fedora-30:
- image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:30-master-55318540
+tests-fedora-31:
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
<<: *tests
tests-ubuntu-18.04:
@@ -78,7 +75,7 @@ tests-python-3.8-buster:
tests-unix:
# Use fedora here, to ensure that we
# can get rid of ostree - this is not possible with debian-8
- image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:30-master-55318540
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
<<: *tests
variables:
BST_FORCE_BACKEND: "unix"
@@ -183,8 +180,7 @@ coverage:
- cp -a .coverage-reports/ ./coverage-report
dependencies:
- tests-debian-9
- - tests-fedora-29
- - tests-fedora-30
+ - tests-fedora-31
- tests-ubuntu-18.04
- tests-unix
except: