summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml21
1 files changed, 19 insertions, 2 deletions
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.