aboutsummaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/common/include-agl-run-test-prepare.sh4
-rw-r--r--jjb/common/include-agl-run-test-rsync-changeid.sh7
2 files changed, 8 insertions, 3 deletions
diff --git a/jjb/common/include-agl-run-test-prepare.sh b/jjb/common/include-agl-run-test-prepare.sh
index b2404f4b..9a56c595 100644
--- 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 0d37641b..9c218f96 100644
--- 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)