From 9641f9ada9dcf6f4ef6d17b0ade4886e5c7a61b7 Mon Sep 17 00:00:00 2001
From: Jonathan Maw <jonathan.maw@codethink.co.uk>
Date: Tue, 19 Mar 2019 17:48:04 +0000
Subject: gitlab-ci: Make WSL tests only run automatically on master

WSL tests may be run on non-master branches manually.

WSL tests on master do not have "allow-failure" so we will be notified
if it's failing.
---
 .gitlab-ci.yml | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c4d2c864a..210de8df4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -151,7 +151,7 @@ lint:
   except:
   - schedules
 
-tests-wsl:
+tests-wsl-master:
   stage: test
   variables:
     LC_ALL: C.UTF-8
@@ -162,10 +162,27 @@ tests-wsl:
   - mount
   - df -h
   - PATH=/root/.local/bin:$PATH tox --version
+  script:
+  - PATH=/root/.local/bin:$PATH ${TEST_COMMAND}
+  only:
+  - master
 
+tests-wsl-non-master:
+  stage: test
+  variables:
+    LC_ALL: C.UTF-8
+    LANG: C.UTF-8
+  tags:
+  - wsl
+  before_script:
+  - mount
+  - df -h
+  - PATH=/root/.local/bin:$PATH tox --version
   script:
   - PATH=/root/.local/bin:$PATH ${TEST_COMMAND}
-  allow_failure: true
+  when: manual
+  except:
+  - master
 
 # Automatically build documentation for every commit, we want to know
 # if building documentation fails even if we're not deploying it.
-- 
cgit v1.2.1