diff options
author | 2017-11-06 23:16:29 +0000 | |
---|---|---|
committer | 2017-11-06 23:16:29 +0000 | |
commit | f97491fd9b898d2b0424f15a1b7542a01b326f87 (patch) | |
tree | ea047306fc6a7baa4e1e79391059b7ae3e1ebeb3 | |
parent | 812f85c71d978476526851cec7612b99bd487b36 (diff) | |
parent | b60f14c15a915276d6b31aded82cad4967ceb8f4 (diff) |
Merge changes Ie341a1ed,Ibd6449c1
* changes:
Update releng calls to use new args
Use releng for rapsberrypi3
-rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index fca819b4..13031e55 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -15,20 +15,22 @@ cd $REPODIR __MACHINE=${MACHINE%-nogfx} # releng doesn't care if [ ! -z $RELENG ] && \ [[ x$__MACHINE == x"qemux86-64" || \ + [[ x$__MACHINE == x"raspberrypi3" || \ x$__MACHINE == x"m3ulcb" ]]; then # releng-scripts depends on jinja2 >= 2.9 echo "## Check version of python-jinja2: " pip show jinja2 CREATE_ARGS="" - [[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="-j $GERRIT_CHANGE_NUMBER " - [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="-i $GERRIT_PATCHSET_NUMBER " - [[ ! -z $TARGETIMAGE ]] && CREATE_ARGS+="--rootfs-img ${TARGETIMAGE}-${__MACHINE}.ext4.xz " + CREATE_ARGS+="--machine ${__MACHINE} " + CREATE_ARGS+="--url ci " + [[ ! -z $GERRIT_CHANGE_NUMBER ]] && CREATE_ARGS+="--changeid $GERRIT_CHANGE_NUMBER " + [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER " 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 " CREATE_ARGS+="--build-version $BUILD_VERSION " CREATE_ARGS+="--callback lab-baylibre-legacy " - CREATE_ARGS+="--test all -- " + CREATE_ARGS+="--test all" $RELENG/utils/create-jobs.py ${CREATE_ARGS} ${__MACHINE} > testjob.yaml cat testjob.yaml else |