Skip to content
Snippets Groups Projects
Commit 0dbf424a authored by Kaspar Schleiser's avatar Kaspar Schleiser
Browse files

murdock: unify dwq env list, pass NIGHTLY and RUN_TESTS to workers

parent 012c016b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 1 deletion
.murdock
+ 4
− 1
View file @ 0dbf424a
...@@ -9,6 +9,8 @@ export DLCACHE_DIR=${DLCACHE_DIR:-~/.dlcache} ...@@ -9,6 +9,8 @@ export DLCACHE_DIR=${DLCACHE_DIR:-~/.dlcache}
NIGHTLY=${NIGHTLY:-0} NIGHTLY=${NIGHTLY:-0}
RUN_TESTS=${RUN_TESTS:-${NIGHTLY}} RUN_TESTS=${RUN_TESTS:-${NIGHTLY}}
DWQ_ENV="-E BOARDS -E APPS -E NIGHTLY -E RUN_TESTS"
check_label() { check_label() {
local label="${1}" local label="${1}"
[ -z "${CI_PULL_LABELS}" ] && return 1 [ -z "${CI_PULL_LABELS}" ] && return 1
...@@ -87,7 +89,7 @@ get_app_board_pairs() { ...@@ -87,7 +89,7 @@ get_app_board_pairs() {
# use dwqc to create full "appdir board" compile job list # use dwqc to create full "appdir board" compile job list
get_compile_jobs() { get_compile_jobs() {
get_apps | \ get_apps | \
dwqc -E BOARDS -E APPS -s \ dwqc ${DWQ_ENV} -s \
"$0 get_app_board_pairs \${1}" \ "$0 get_app_board_pairs \${1}" \
| xargs '-d\n' -n 1 echo $0 compile | xargs '-d\n' -n 1 echo $0 compile
} }
...@@ -160,6 +162,7 @@ test_job() { ...@@ -160,6 +162,7 @@ test_job() {
} }
dwqc \ dwqc \
${DWQ_ENV} \
${DWQ_JOBID:+--subjob} \ ${DWQ_JOBID:+--subjob} \
--file $flashfile:$appdir/bin/${board}/$(basename $flashfile) \ --file $flashfile:$appdir/bin/${board}/$(basename $flashfile) \
--queue ${TEST_QUEUE:-$board} \ --queue ${TEST_QUEUE:-$board} \
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment