summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schubert <ben.c.schubert@gmail.com>2018-11-09 17:33:33 +0000
committerBenjamin Schubert <ben.c.schubert@gmail.com>2018-11-20 18:10:48 +0000
commit8668df9fed4861ccce5d3b30d2cdf5a1e551223b (patch)
treee77725655c69bd2a5a74d3871bf831a577d22594
parent87751350e46b5a3c44d1ba8b334afcb48e1fa254 (diff)
downloadbuildstream-8668df9fed4861ccce5d3b30d2cdf5a1e551223b.tar.gz
Export variables globally for less repetition.
This doesn't change the test behavior and enable for better composability of tests
-rw-r--r--.gitlab-ci.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40946491d..d6e6ad9c3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,6 +10,10 @@ stages:
- test
- post
+variables:
+ PYTEST_ADDOPTS: "--color=yes"
+ INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
+
#####################################################
# Prepare stage #
#####################################################
@@ -54,9 +58,6 @@ source_dist:
#
.linux-tests-template: &linux-tests
stage: test
- variables:
- PYTEST_ADDOPTS: "--color=yes"
- INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
script:
# Diagnostics
@@ -122,8 +123,7 @@ tests-unix:
stage: test
variables:
BST_FORCE_BACKEND: "unix"
- PYTEST_ADDOPTS: "--color=yes"
- INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
+
script:
# We remove the Bubblewrap and OSTree packages here so that we catch any