diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2019-03-20 13:23:48 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2019-03-20 13:23:48 +0000 |
| commit | eb12178d7e3ab6e2e6a029e644c1ed55607148cb (patch) | |
| tree | f028f815a5ae8df5b7fe57c9c681089e67cb0b80 | |
| parent | e1b1e6c9d552cd960e1531023ead44c9f3408b45 (diff) | |
| parent | 9641f9ada9dcf6f4ef6d17b0ade4886e5c7a61b7 (diff) | |
| download | buildstream-eb12178d7e3ab6e2e6a029e644c1ed55607148cb.tar.gz | |
Merge branch 'jonathan/wsl-tests-manual' into 'master'
gitlab-ci: Make WSL tests only run automatically on master
See merge request BuildStream/buildstream!1241
| -rw-r--r-- | .gitlab-ci.yml | 21 |
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. |