aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dechesne <nicolas.dechesne@linaro.org>2022-08-11 17:51:49 +0200
committerNicolas Dechesne <nicolas.dechesne@linaro.org>2022-08-11 17:51:49 +0200
commitda0bbf0fcc1fe0a838e3a8db880fda69d1ea2ec8 (patch)
tree3e008b740594d237f7dbaa0913a0656b75e52abd
parentabbf9dd70826d7fcc48699bd86edab2714437fe4 (diff)
downloadconfigs-master.tar.gz
lt-qcom, tux: do not hardcode tuxbuild locationHEADmaster
In all these jobs, we've hardcoded the location for the tux builds to be https://oebuilds.tuxbuild.com, although the actual build URL is included in the JSON file. So let's get the URL from the JSON file, instead of guessing it. Recently tuxsuite changed their output url to storage.tuxsuite.com, which of course resulted in all these jobs to fail! Change-Id: I54363b8372f09ad0de5c1a207ea44dd80e690b5d Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org>
-rw-r--r--lt-qcom/meta-qcom-tux.sh6
-rw-r--r--lt-qcom/poky-tux.sh6
-rw-r--r--rpb-openembedded/builders-tux.sh10
3 files changed, 11 insertions, 11 deletions
diff --git a/lt-qcom/meta-qcom-tux.sh b/lt-qcom/meta-qcom-tux.sh
index 2a1d92df80..953947d9eb 100644
--- a/lt-qcom/meta-qcom-tux.sh
+++ b/lt-qcom/meta-qcom-tux.sh
@@ -66,7 +66,7 @@ if [ ! -f status.json ]; then
exit 1
fi
-uid=$(cat status.json | jq -r ".uid")
+url=$(cat status.json | jq -r ".download_url")
state=$(cat status.json | jq -r ".state")
result=$(cat status.json | jq -r ".result")
@@ -75,10 +75,10 @@ if [ "$state" != "finished" ]; then
exit 1
fi
-wget https://oebuilds.tuxbuild.com/$uid/build.log
+wget $url/build.log
cat build.log
-echo "TUXBUILD_URL=https://oebuilds.tuxbuild.com/$uid" > parameters
+echo "TUXBUILD_URL=$url" > parameters
if [ "$result" != "pass" ]; then
echo "tuxsuite build failed"
diff --git a/lt-qcom/poky-tux.sh b/lt-qcom/poky-tux.sh
index 2e0f47c8a5..1d762506ec 100644
--- a/lt-qcom/poky-tux.sh
+++ b/lt-qcom/poky-tux.sh
@@ -53,7 +53,7 @@ if [ ! -f status.json ]; then
exit 1
fi
-uid=$(cat status.json | jq -r ".uid")
+url=$(cat status.json | jq -r ".download_url")
state=$(cat status.json | jq -r ".state")
result=$(cat status.json | jq -r ".result")
@@ -62,10 +62,10 @@ if [ "$state" != "finished" ]; then
exit 1
fi
-wget https://oebuilds.tuxbuild.com/$uid/build.log
+wget $url/build.log
cat build.log
-echo "TUXBUILD_URL=https://oebuilds.tuxbuild.com/$uid" > ${WORKSPACE}/parameters
+echo "TUXBUILD_URL=$url" > ${WORKSPACE}/parameters
if [ "$result" != "pass" ]; then
echo "tuxsuite build failed"
diff --git a/rpb-openembedded/builders-tux.sh b/rpb-openembedded/builders-tux.sh
index aca90f90f5..c661805f81 100644
--- a/rpb-openembedded/builders-tux.sh
+++ b/rpb-openembedded/builders-tux.sh
@@ -77,7 +77,7 @@ if [ ! -f status.json ]; then
exit 1
fi
-uid=$(cat status.json | jq -r ".uid")
+url=$(cat status.json | jq -r ".download_url")
state=$(cat status.json | jq -r ".state")
result=$(cat status.json | jq -r ".result")
@@ -86,10 +86,10 @@ if [ "$state" != "finished" ]; then
exit 1
fi
-wget https://oebuilds.tuxbuild.com/$uid/build.log
+wget $url/build.log
cat build.log
-echo "TUXBUILD_URL=https://oebuilds.tuxbuild.com/$uid" > parameters
+echo "TUXBUILD_URL=$url" > parameters
if [ "$result" != "pass" ]; then
echo "tuxsuite build failed"
@@ -105,8 +105,8 @@ DEPLOY_DIR_IMAGE=${PWD}/deploy_dir_images
echo "DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}" >> parameters
# files to download
-wget https://oebuilds.tuxbuild.com/$uid/?export=json -O root.json
-wget https://oebuilds.tuxbuild.com/$uid/images/${MACHINE}/?export=json -O images.json
+wget $url/?export=json -O root.json
+wget $url/images/${MACHINE}/?export=json -O images.json
mkdir ${DEPLOY_DIR_IMAGE} && pushd ${DEPLOY_DIR_IMAGE}