diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-04-30 13:38:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2019-04-30 13:38:49 +0000 |
| commit | aafe45538122a03b7b507c973a1aa5885eb58851 (patch) | |
| tree | 05dfad205b2f66543021a572a8bed8bb4af46315 | |
| parent | 54d2b08a1d8c86be2d525248b7c8ecc66395c913 (diff) | |
| parent | df7708c9fd8d92829452ca911c3f97aff2c85bcb (diff) | |
Merge "Add caller to new branch argument for releng"
| -rw-r--r-- | jjb/common/include-agl-run-test-prepare.sh | 4 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-test-rsync-changeid.sh | 7 |
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) |