diff options
author | Kevin Hilman <khilman@baylibre.com> | 2019-03-21 15:25:47 -0700 |
---|---|---|
committer | Kevin Hilman <khilman@baylibre.com> | 2019-03-21 15:26:10 -0700 |
commit | 07f140e2ad006f544dc3ce4b383d8c60fa42dc79 (patch) | |
tree | 835825147983345c14ba1e3c701e8bab8824b6b0 | |
parent | d5812e6dbb6f425a3afd30341def8adb09f96f3a (diff) |
jjb/common: run-test-short: fetch/source build-info
Before trying to cat/source build-info, we have to fetch it from the
location where it was uploaded during the main build phase.
Change-Id: Ic9d8916a3a349f3b29cb2d5ef558c78729703908
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-rw-r--r-- | jjb/common/include-agl-run-test-short-guppy.sh | 10 | ||||
-rw-r--r-- | jjb/common/include-agl-run-test-short.sh | 12 |
2 files changed, 17 insertions, 5 deletions
diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh index 29085064..634d9153 100644 --- a/jjb/common/include-agl-run-test-short-guppy.sh +++ b/jjb/common/include-agl-run-test-short-guppy.sh @@ -7,8 +7,16 @@ set -x +UPLOAD_URL_BASE=https://download.automotivelinux.org/AGL/upload/ci +UPLOAD_URL=${UPLOAD_URL_BASE}/${RELEASE_BRANCH}/${RELEASE_VERSION}/${MACHINE}/deploy/images/${TARGETMACHINE} + cd $REPODIR -source tmp/deploy/images/${TARGETMACHINE}/build-info + +wget -q ${UPLOAD_URL}/build-info +if [ -e build-info ]; then + cat build-info + source build-info +fi echo "# LAVA lab target: ${LAVA_LAB} #" # releng-scripts depends on jinja2 >= 2.9 diff --git a/jjb/common/include-agl-run-test-short.sh b/jjb/common/include-agl-run-test-short.sh index 6fb72ac8..1582a72c 100644 --- a/jjb/common/include-agl-run-test-short.sh +++ b/jjb/common/include-agl-run-test-short.sh @@ -7,11 +7,15 @@ set -x +UPLOAD_URL_BASE=https://download.automotivelinux.org/AGL/upload/ci +UPLOAD_URL=${UPLOAD_URL_BASE}/${GERRIT_CHANGE_NUMBER}/${GERRIT_PATCHSET_NUMBER} + cd $REPODIR -#cat build-info -if [ -e tmp/deploy/images/${TARGETMACHINE}/build-info ]; then - cat tmp/deploy/images/${TARGETMACHINE}/build-info - source tmp/deploy/images/${TARGETMACHINE}/build-info + +wget -q ${UPLOAD_URL}/build-info +if [ -e build-info ]; then + cat build-info + source build-info fi echo "# LAVA lab target: ${LAVA_LAB} #" |