From 8668df9fed4861ccce5d3b30d2cdf5a1e551223b Mon Sep 17 00:00:00 2001
From: Benjamin Schubert <ben.c.schubert@gmail.com>
Date: Fri, 9 Nov 2018 17:33:33 +0000
Subject: Export variables globally for less repetition.

This doesn't change the test behavior and enable for better
composability of tests
---
 .gitlab-ci.yml | 10 +++++-----
 1 file 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
-- 
cgit v1.2.1