From 6f9b3116e8cb7d80e27e72f3e94e9ecce9c7217b Mon Sep 17 00:00:00 2001
From: Khouloud Touil <ktouil@baylibre.com>
Date: Wed, 27 Feb 2019 14:07:37 +0100
Subject: 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>
---
 jjb/common/include-agl-run-test-short-guppy.sh | 4 +---
 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} "
-- 
cgit 1.2.3-korg


From 06b60bc9d0ea1f3933a878e6985985362b194131 Mon Sep 17 00:00:00 2001
From: Khouloud Touil <ktouil@baylibre.com>
Date: Wed, 27 Feb 2019 14:10:03 +0100
Subject: Use the new --commit argument

This patch uses a new --commit argument that will contain the
DIST_BUILD_HASH value that is extracted from the build-info
file. These changes are in both files 'include-agl-run-test
-short-guppy.sh' and 'include-agl-run-test-short.sh'.

Change-Id: Ifd68eb4270f3540e1a379fac135d7f290374d1d7
Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
---
 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 d6a60764..6852600b 100644
--- a/jjb/common/include-agl-run-test-short-guppy.sh
+++ b/jjb/common/include-agl-run-test-short-guppy.sh
@@ -22,6 +22,7 @@ CREATE_ARGS+="--build-type release "
 CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE}/ "
 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 "
 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 0598d9e7..7ebc91ee 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -23,6 +23,7 @@ CREATE_ARGS+="--build-type ci "
 [[ ! -z $GERRIT_PATCHSET_NUMBER ]] && CREATE_ARGS+="--patchset $GERRIT_PATCHSET_NUMBER "
 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 "
 CREATE_ARGS+="--callback-from ${LAVA_LAB} "
 if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then
 	CREATE_ARGS+="--device-tags ${lavacli_tags} "
-- 
cgit 1.2.3-korg


From e59eb07ccfda79815c9370070d6571ceaf5f6912 Mon Sep 17 00:00:00 2001
From: Khouloud Touil <ktouil@baylibre.com>
Date: Wed, 27 Feb 2019 14:13:31 +0100
Subject: Use the new --build-id argument

This patch uses the new --build-id argument of create-jobs that will
contain the DIST_BUILD_ID value that is extracted from the build-info
file.

Change-Id: Ic1bf82967a4cd94bce9701251d7f5a9700998271
Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
---
 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 6852600b..d05931b8 100644
--- a/jjb/common/include-agl-run-test-short-guppy.sh
+++ b/jjb/common/include-agl-run-test-short-guppy.sh
@@ -23,6 +23,7 @@ CREATE_ARGS+="--url https://download.automotivelinux.org/AGL/upload/ci/${RELEASE
 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 "
 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 7ebc91ee..459eb59a 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -24,6 +24,7 @@ CREATE_ARGS+="--build-type ci "
 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 "
 CREATE_ARGS+="--callback-from ${LAVA_LAB} "
 if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then
 	CREATE_ARGS+="--device-tags ${lavacli_tags} "
-- 
cgit 1.2.3-korg


From 2ccb4a2d233415b6f8e884a2da177e32dacdf8ed Mon Sep 17 00:00:00 2001
From: Khouloud Touil <ktouil@baylibre.com>
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 <ktouil@baylibre.com>
---
 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


From dc85ae0e254679937fa8c8414c3fadbb066356bd Mon Sep 17 00:00:00 2001
From: Khouloud Touil <ktouil@baylibre.com>
Date: Wed, 27 Feb 2019 14:17:30 +0100
Subject: Use the --version argument

This patch uses the --version argument that will contain the
DIST_BB_AGLVERSION value that is extracted from the build-info file.

Change-Id: I81dfc60f290db8983af9dfcc51f47a71c1a2b031
Signed-off-by: Khouloud Touil <ktouil@baylibre.com>
---
 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 ab0411a1..29085064 100644
--- a/jjb/common/include-agl-run-test-short-guppy.sh
+++ b/jjb/common/include-agl-run-test-short-guppy.sh
@@ -25,6 +25,7 @@ CREATE_ARGS+="--name AGL-gerrit-$RELEASE_BRANCH-$RELEASE_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 "
+[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
 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 350a294a..c397f126 100644
--- a/jjb/common/include-agl-run-test-short.sh
+++ b/jjb/common/include-agl-run-test-short.sh
@@ -26,6 +26,7 @@ CREATE_ARGS+="--name AGL-gerrit-$GERRIT_CHANGE_NUMBER-$GERRIT_PATCHSET_NUMBER "
 [[ ! -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 "
+[[ ! -z $DIST_BB_AGLVERSION ]] && CREATE_ARGS+="--version $DIST_BB_AGLVERSION "
 CREATE_ARGS+="--callback-from ${LAVA_LAB} "
 if [[ ! -z $lavacli_tags ]] && [[ $MACHINE =~ "-nogfx" ]]; then
 	CREATE_ARGS+="--device-tags ${lavacli_tags} "
-- 
cgit 1.2.3-korg