summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2018-02-12 20:37:50 +0100
committerJürg Billeter <j@bitron.ch>2018-02-12 21:43:15 +0100
commite52f2e42776e1f0900b1087d1f468fd300af2126 (patch)
treeebaf6d6ee1fab6f05cd586a9df79811efc5967f1
parent779f369b3a62578db66c474c17b14532dbc25930 (diff)
downloadbuildstream-e52f2e42776e1f0900b1087d1f468fd300af2126.tar.gz
.gitlab-ci.yml: Fix INTEGRATION_CACHE
The working directory of the runner is /builds/BuildStream/buildstream, not /builds/BuildStream.
-rw-r--r--.gitlab-ci.yml7
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e44fc7b2..a4173f0c5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,9 +15,6 @@ before_script:
- mount
- df -h
- - mkdir -p "$(pwd)/cache"
- - chmod -R a+rw "$(pwd)/cache"
-
- adduser -m buildstream
- chown -R buildstream:buildstream .
@@ -71,7 +68,7 @@ linux-tests:
stage: test
variables:
PYTEST_ADDOPTS: "--color=yes"
- INTEGRATION_CACHE: "/builds/BuildStream/cache/"
+ INTEGRATION_CACHE: "/builds/BuildStream/buildstream/cache/"
script:
# Unpack and get into dist/buildstream
@@ -98,7 +95,7 @@ unix-tests:
variables:
BST_FORCE_BACKEND: "unix"
PYTEST_ADDOPTS: "--color=yes"
- INTEGRATION_CACHE: "/builds/BuildStream/cache/"
+ INTEGRATION_CACHE: "/builds/BuildStream/buildstream/cache/"
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