From 2ccb4a2d233415b6f8e884a2da177e32dacdf8ed Mon Sep 17 00:00:00 2001 From: Khouloud Touil Date: Wed, 27 Feb 2019 14:15:25 +0100 Subject: Use the --branch argument This patch uses the --branch argument that will contain the DIST_BB_AGL_BRANCH value that is extracted from the build-info file. Change-Id: I56fe3edcfc73b0ce661181283f029026e2b37811 Signed-off-by: Khouloud Touil --- jjb/common/include-agl-run-test-short-guppy.sh | 1 + jjb/common/include-agl-run-test-short.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh index d05931b8..ab0411a1 100644 --- a/jjb/common/include-agl-run-test-short-guppy.sh +++ b/jjb/common/include-agl-run-test-short-guppy.sh @@ -24,6 +24,7 @@ CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION " [[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " [[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH " [[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID " +[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH " CREATE_ARGS+="--callback-from ${LAVA_LAB} " $RELENG/utils/create-jobs.py ${CREATE_ARGS} > testjob.yaml diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 459eb59a..350a294a 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -25,6 +25,7 @@ CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " [[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " [[ ! -z $DIST_BUILD_HASH ]] && CREATE_ARGS+="--commit $DIST_BUILD_HASH " [[ ! -z $DIST_BUILD_ID ]] && CREATE_ARGS+="--build-id $DIST_BUILD_ID " +[[ ! -z $DIST_BB_AGL_BRANCH ]] && CREATE_ARGS+="--branch $DIST_BB_AGL_BRANCH " CREATE_ARGS+="--callback-from ${LAVA_LAB} " if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then CREATE_ARGS+="--device-tags ${lavacli_tags} " -- cgit 1.2.3-korg