diff options
| author | Javier Jardón <jjardon@gnome.org> | 2019-02-12 13:31:56 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2019-02-12 13:31:56 +0000 |
| commit | 95d9b9ae5cc2807959390be355be339ef151a524 (patch) | |
| tree | ff7a7a82f54469553c114211be1e646ef56e73c8 | |
| parent | dbce34347e03b00600ad3a6cdb69657f5c168706 (diff) | |
| parent | 58b849053d299232f918fde6a3f523c1d318b5db (diff) | |
| download | buildstream-95d9b9ae5cc2807959390be355be339ef151a524.tar.gz | |
Merge branch 'jjardon/fedora_29' into 'master'
.gitlab-ci.yml: Test with current fedora release: 29
See merge request BuildStream/buildstream!1137
| -rw-r--r-- | .gitlab-ci.yml | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41313b97b..7bf9979a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -53,26 +53,20 @@ tests-fedora-28: image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991 <<: *tests -tests-ubuntu-18.04: - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991 +tests-fedora-29: + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095 <<: *tests -tests-python-3.7-stretch: - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-python:3.7-stretch-master-46405991 +tests-ubuntu-18.04: + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-master-46405991 <<: *tests - variables: - # Note that we explicitly specify TOXENV in this case because this - # image has both 3.6 and 3.7 versions. python3.6 cannot be removed because - # some of our base dependencies declare it as their runtime dependency. - TOXENV: py37 - tests-centos-7.6: <<: *tests image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-centos:7.6.1810-master-46405991 -overnight-fedora-28-aarch64: - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:aarch64-28-master-46405991 +overnight-fedora-29-aarch64: + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:aarch64-29-master-47052095 tags: - aarch64 <<: *tests @@ -91,7 +85,7 @@ overnight-fedora-28-aarch64: tests-unix: # Use fedora here, to a) run a test on fedora and b) 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:28-master-46405991 + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095 <<: *tests variables: BST_FORCE_BACKEND: "unix" @@ -109,7 +103,7 @@ tests-unix: tests-fedora-missing-deps: # Ensure that tests behave nicely while missing bwrap and ostree - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991 + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095 <<: *tests script: @@ -128,7 +122,7 @@ tests-fedora-update-deps: # Check if the tests pass after updating requirements to their latest # allowed version. allow_failure: true - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:28-master-46405991 + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-47052095 <<: *tests script: @@ -289,6 +283,7 @@ coverage: dependencies: - tests-debian-9 - tests-fedora-28 + - tests-fedora-29 - tests-fedora-missing-deps - tests-ubuntu-18.04 - tests-unix |