summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2020-04-28 17:48:33 +0200
committerJürg Billeter <j@bitron.ch>2020-04-28 17:48:33 +0200
commit1b93973d703b1c6ebdf506542c5dd9dfceff6157 (patch)
treefd3015c43d6ce61c6969135b4969bff9bc0a482f
parent28b4bc9c50bea450fb6f908b4c04530e63cd89eb (diff)
downloadbuildstream-juerg/sandbox-ci.tar.gz
-rw-r--r--.gitlab-ci.yml20
1 files changed, 1 insertions, 19 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 502667d5e..e4f5c9485 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
# Our own variables
# Version of the docker images we should use for all the images.
# This is taken from buildstream/buildstream-docker-images
- DOCKER_IMAGE_VERSION: master-138527946
+ DOCKER_IMAGE_VERSION: juerg-fuse3-140709680
PYTEST_ADDOPTS: "--color=yes"
INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
PYTEST_ARGS: "--color=yes --integration -n 2"
@@ -62,21 +62,3 @@ variables:
tests-debian-10:
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-${DOCKER_IMAGE_VERSION}
<<: *tests
-
-tests-fedora-missing-deps:
- # Ensure that tests behave nicely while missing bwrap and ostree
- image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
- <<: *tests
-
- script:
- # We remove the Bubblewrap and OSTree packages here so that we catch any
- # codepaths that try to use them. Removing OSTree causes fuse-libs to
- # disappear unless we mark it as user-installed.
- - dnf mark install fuse-libs systemd-udev
- - dnf erase -y bubblewrap ostree
-
- - useradd -Um buildstream
- - chown -R buildstream:buildstream .
-
- - ${TEST_COMMAND}
- - ${PLUGINS_TESTS_COMMAND}