diff options
| author |   Khouloud Touil <ktouil@baylibre.com> | 2019-02-27 14:07:37 +0100 |
|---|---|---|
| committer | Khouloud Touil <ktouil@baylibre.com> | 2019-02-27 14:07:37 +0100 |
| commit | 6f9b3116e8cb7d80e27e72f3e94e9ecce9c7217b (patch) | |
| tree | c600932e2445dd239bbbac9cd5c198b2ef0cd553 | |
| parent | b0474f0360fc48129f6cfeb2d3880c63355baec7 (diff) | |
Modify the --build-version content
Modify the --build-version content to take the DIST_BB_DISTRO_VERSION
content which is going to be extracted from the build-info file in both
files 'include-agl-run-test-short-guppy.sh' and 'include-agl-run-test-short.sh'.
Change-Id: Iddf7394c624a5fdc08cddf806eaebb70456c4398
Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
| -rw-r--r-- | jjb/common/include-agl-run-test-short-guppy.sh | 4 | ||||
| -rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh index 42565b4e..d6a60764 100644 --- a/jjb/common/include-agl-run-test-short-guppy.sh +++ b/jjb/common/include-agl-run-test-short-guppy.sh @@ -20,10 +20,8 @@ CREATE_ARGS+="--build-type release " #[[ ! -z $RELEASE_BRANCH ]] && CREATE_ARGS+="--branch $RELEASE_BRANCH " #[[ ! -z $RELEASE_VERSION ]] && CREATE_ARGS+="--version $RELEASE_VERSION " CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ " -BUILD_VERSION="AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION" -[[ -e output/repo-manifest-r.txt.sha1 ]] && BUILD_VERSION+="-$(cat output/repo-manifest-r.txt.sha1)" CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_VERSION " -CREATE_ARGS+="--build-version $BUILD_VERSION " +[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " 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 3a79a2bd..0598d9e7 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -21,10 +21,8 @@ CREATE_ARGS+="--machine ${releng_device} " CREATE_ARGS+="--build-type 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-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER " -CREATE_ARGS+="--build-version $BUILD_VERSION " +[[ ! -z $DIST_BB_DISTRO_VERSION ]] && CREATE_ARGS+="--build-version $DIST_BB_DISTRO_VERSION " CREATE_ARGS+="--callback-from ${LAVA_LAB} " if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then CREATE_ARGS+="--device-tags ${lavacli_tags} " |