diff options
author | 2017-11-07 15:35:21 +0100 | |
---|---|---|
committer | 2017-11-07 15:54:28 +0100 | |
commit | 41f2a94135443b239d3335949726b4223d8c2f3d (patch) | |
tree | 052e1a32cc23ae77f8c6dcd42883067e26eaa5dd /jjb/common/include-agl-run-test-short.sh | |
parent | be498bcfdd7c0c2a3e47de0d8f6a04d9ef455662 (diff) |
CIBT find the LAVA lab before calling releng
Add some logic to lava-labs-prepare:
- Search for the machine in the list of labs
- export the lab name if found
Call releng with the corresponding lab name in run-test-short
Send the job directly to the corresponding lab in lava-jobs-submit.
Keep the 'checking for device' in this script as well, just to make sure
the device is still available and can run the job. Otherwise the script
could be blocked there if the device status changes.
Change-Id: I50646b7fdb607cb9245a1d31e644eee45a2a2356
Signed-off-by: Loys Ollivier <lollivier@baylibre.com>
Diffstat (limited to 'jjb/common/include-agl-run-test-short.sh')
-rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 83bfc18c..fda2da9e 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -5,10 +5,19 @@ ## Run SHORT CI test ################################################################################ - set -x +# +# LAVA lab names for releng-scripts +# +declare -A lava_labs +lava_labs=( + [agl]="lab-agl-core" + [baylibre]="lab-baylibre-legacy" + ) + echo "## ${MACHINE} ##" +echo "# ${lava_labs[$LAVA_LAB]} #" cd $REPODIR # WIP: use $RELENG for subset of boards @@ -29,7 +38,7 @@ if [ ! -z $RELENG ] && \ [[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" CREATE_ARGS+="--name AGL-gerrit " CREATE_ARGS+="--build-version $BUILD_VERSION " - CREATE_ARGS+="--callback lab-baylibre-legacy " + CREATE_ARGS+="--callback ${lava_labs[$LAVA_LAB]} " CREATE_ARGS+="--test all" $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml cat testjob.yaml |