summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbst-marge-bot <marge-bot@buildstream.build>2020-04-08 11:41:06 +0000
committerbst-marge-bot <marge-bot@buildstream.build>2020-04-08 11:41:06 +0000
commit9ba60e6c42058e6e5d46056a395fe50fcad267d2 (patch)
tree2690e9248bea745df8fc2e6fe0ad3ae516206843
parent7e0d049c3917b51caf669af9d070d2468a7aa1d2 (diff)
parent33040c309680f04c64e410b86bc46729c7242558 (diff)
downloadbuildstream-9ba60e6c42058e6e5d46056a395fe50fcad267d2.tar.gz
Merge branch 'juerg/ci-schedules' into 'master'
.gitlab-ci.yml: Don't run win32 and wsl tests in scheduled pipelines See merge request BuildStream/buildstream!1859
-rw-r--r--.gitlab-ci.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 90cd9684e..8efca653c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -269,6 +269,8 @@ tests-win32-master:
- tox -e win32
only:
- master
+ except:
+ - schedules
# Optional test to catch regressions in native windows support on non-master branches
tests-win32-non-master:
@@ -303,6 +305,8 @@ tests-wsl-master:
- PATH=/root/.local/bin:$PATH ${TEST_COMMAND}
only:
- master
+ except:
+ - schedules
allow_failure: true