aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2018-11-19 10:02:07 -0800
committerKevin Hilman <khilman@baylibre.com>2018-11-19 10:02:11 -0800
commit7c07ede5c56fd730fd0aca363924525c5690ee95 (patch)
tree871c7f7f604c09fce78f6786d7bc8f23e9beb8d3
parentb76de43474cf1139d7a2da162516b22df3db4acc (diff)
jjb/common: run-test-short release: use TARGETMACHINE
The "deploy/images" dir pushd to the downloads server does not have the -nogfx suffix. Therefore, use $TARGETMACHINE instead of $MACHINE when passing --url to releng-scripts so that the machine name is correct in the URL. Change-Id: I3403851fa9f89e2839c7311db5d2ca1f555da3b7 Signed-off-by: Kevin Hilman <khilman@baylibre.com>
-rw-r--r--jjb/common/include-agl-run-test-short-flounder.sh2
-rw-r--r--jjb/common/include-agl-run-test-short-guppy.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/common/include-agl-run-test-short-flounder.sh b/jjb/common/include-agl-run-test-short-flounder.sh
index 0b2edfb0..b4f23027 100644
--- a/jjb/common/include-agl-run-test-short-flounder.sh
+++ b/jjb/common/include-agl-run-test-short-flounder.sh
@@ -18,7 +18,7 @@ CREATE_ARGS+="--machine ${releng_device} "
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/${MACHINE}/ "
+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 "
diff --git a/jjb/common/include-agl-run-test-short-guppy.sh b/jjb/common/include-agl-run-test-short-guppy.sh
index 0b2edfb0..b4f23027 100644
--- a/jjb/common/include-agl-run-test-short-guppy.sh
+++ b/jjb/common/include-agl-run-test-short-guppy.sh
@@ -18,7 +18,7 @@ CREATE_ARGS+="--machine ${releng_device} "
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/${MACHINE}/ "
+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 "