From 0dbf424a022cf452cd366bd972ab9757d9de8ad5 Mon Sep 17 00:00:00 2001 From: Kaspar Schleiser <kaspar@schleiser.de> Date: Wed, 11 Apr 2018 09:57:18 +0200 Subject: [PATCH] murdock: unify dwq env list, pass NIGHTLY and RUN_TESTS to workers --- .murdock | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.murdock b/.murdock index e0f44506e8..fa3c913fa7 100755 --- a/.murdock +++ b/.murdock @@ -9,6 +9,8 @@ export DLCACHE_DIR=${DLCACHE_DIR:-~/.dlcache} NIGHTLY=${NIGHTLY:-0} RUN_TESTS=${RUN_TESTS:-${NIGHTLY}} +DWQ_ENV="-E BOARDS -E APPS -E NIGHTLY -E RUN_TESTS" + check_label() { local label="${1}" [ -z "${CI_PULL_LABELS}" ] && return 1 @@ -87,7 +89,7 @@ get_app_board_pairs() { # use dwqc to create full "appdir board" compile job list get_compile_jobs() { get_apps | \ - dwqc -E BOARDS -E APPS -s \ + dwqc ${DWQ_ENV} -s \ "$0 get_app_board_pairs \${1}" \ | xargs '-d\n' -n 1 echo $0 compile } @@ -160,6 +162,7 @@ test_job() { } dwqc \ + ${DWQ_ENV} \ ${DWQ_JOBID:+--subjob} \ --file $flashfile:$appdir/bin/${board}/$(basename $flashfile) \ --queue ${TEST_QUEUE:-$board} \ -- GitLab