diff options
Diffstat (limited to 'jjb/common')
| -rw-r--r-- | jjb/common/include-agl-app-run-test-short.sh | 1 | ||||
| -rw-r--r-- | jjb/common/include-agl-lava-jobs-submit.sh | 2 | ||||
| -rw-r--r-- | jjb/common/include-agl-lava-labs-prepare.sh | 6 |
3 files changed, 4 insertions, 5 deletions
diff --git a/jjb/common/include-agl-app-run-test-short.sh b/jjb/common/include-agl-app-run-test-short.sh index 1ff49355..7a8f59e5 100644 --- a/jjb/common/include-agl-app-run-test-short.sh +++ b/jjb/common/include-agl-app-run-test-short.sh @@ -33,6 +33,7 @@ esac CREATE_ARGS+="--build-type snapshot --branch master --version latest " [[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--app-changeid $GERRIT_CHANGE_NUMBER " [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--app-patchset $GERRIT_PATCHSET_NUMBER " +[[ ! -z $AGLBRANCH ]] && CREATE_ARGS+="--app-branch $AGLBRANCH " BUILD_VERSION="AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER" [[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh index c221b7e7..55db062a 100644 --- a/jjb/common/include-agl-lava-jobs-submit.sh +++ b/jjb/common/include-agl-lava-jobs-submit.sh @@ -92,7 +92,7 @@ echo "####" set -x if [ -n "$KCI_EMAIL_AUTH_TOKEN" ]; then - KCI_API='https://kernelci.dev.baylibre.com:8081' + KCI_API='http://kernelci.dev.baylibre.com:8081' TREE_NAME=$(grep kernel.tree: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2) BRANCH=$(grep git.branch: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2) GIT_DESCRIBE="$(grep kernel.version: $JOB_FILE_NEW | sed 's,[[:space:]],,g' | cut -d: -f2)" diff --git a/jjb/common/include-agl-lava-labs-prepare.sh b/jjb/common/include-agl-lava-labs-prepare.sh index ab60a739..bfa213c4 100644 --- a/jjb/common/include-agl-lava-labs-prepare.sh +++ b/jjb/common/include-agl-lava-labs-prepare.sh @@ -103,14 +103,13 @@ for lab in "${!labs[@]}"; do for i in `seq 1 $retries` do # device is only available if "idle" or "running" - sleep 60s # Look if the status of the board has changed from reserved in the lab echo -n "Checking for $lava_device at $full_url... " lavacli_line=$(lavacli -i $lab devices list | grep $lava_device | grep Good | head -1) lavacli_line=$(echo "$lavacli_line" | tr -d '[:space:]') if [ -z "$lavacli_line" ]; then echo "not found." - continue + break fi IFS=':' arr=($lavacli_line) @@ -119,15 +118,14 @@ for lab in "${!labs[@]}"; do if [ x"$device_status" = x"Reserved,Good" ]; then echo "Device still reserved, retries left: $retries ." - continue elif [ x"$device_status" = x"Idle,Good" ]; then # IDLE AND GOOD means we can grab it device_available=1 break elif [ x"$device_status" = x"Running,Good" ]; then echo "Device still running (other job), retries left: $retries ." - continue fi + sleep 60s done if [ $device_available = 0 ]; then |