Add caller to new branch argument for releng

This is necessary to deal with the dtb changes in releng and not the CI scripts.

Change-Id: Ia12a8ccbb0527f7bd4a5518aeaefc5dafd7a7919
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index b2404f4..9a56c59 100644 (file)
--- a/jjb/common/include-agl-run-test-prepare.sh
+++ b/jjb/common/include-agl-run-test-prepare.sh
@@ -49,6 +49,10 @@ fi
 CREATE_ARGS=""
 CREATE_ARGS+="--machine ${releng_device} "
 
+if [[ $TARGETBRANCH ]] && [[ x"master" != x"$TARGETBRANCH" ]] ; then
+CREATE_ARGS+="--branch $TARGETBRANCH "
+fi
+
 # If it's a release build
 if [[ $RELEASE_BRANCH ]] && [[ $RELEASE_VERSION ]]; then
     CREATE_ARGS+="--build-type release $RELEASE_BRANCH $RELEASE_VERSION "

diff --git a/jjb/common/include-agl-run-test-rsync-changeid.sh b/jjb/common/include-agl-run-test-rsync-changeid.sh
index 0d37641..9c218f9 100644 (file)
--- a/jjb/common/include-agl-run-test-rsync-changeid.sh
+++ b/jjb/common/include-agl-run-test-rsync-changeid.sh
@@ -33,10 +33,11 @@ set -x
 echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}"
 echo "tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-}"
 
+## fixed in releng with --branch
 # workaround for thud until fixed in templates:
-if [ ! -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB} -a -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} ] ; then
-    cp -avL tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}
-fi
+#if [ ! -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB} -a -e tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} ] ; then
+#    cp -avL tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB#"$DEVICE_KERNEL"-} tmp/deploy/images/${TARGETMACHINE}/${DEVICE_DTB}
+#fi
 
 BUILD_INFO=build-info
 # copy files to $DEST (only if variable is non-empty)