aboutsummaryrefslogtreecommitdiff
path: root/android-cts
diff options
context:
space:
mode:
authorYongqin Liu <yongqin.liu@linaro.org>2019-09-16 11:47:45 +0800
committerYongqin Liu <yongqin.liu@linaro.org>2019-09-16 03:51:38 +0000
commit26a2814ca43070ee021cafa961e9479a213c0ca1 (patch)
tree5cfe744e62af6dbf3e6fda2e50e02a78759b3d9e /android-cts
parent465c2b6c79d3670c9aa760bf2158a00f9253d223 (diff)
android-cts/builders.sh: convert '_' in path to '-'
need to convert '_' in the url path to '-' otherwise, like aosp_arm64-userdebug will be translated to '~aosp/arm64-userdebug' when upload to snapshot.linaro.org via linaro-cp.py like reported here: https://ci.linaro.org/job/android-cts/20/console Change-Id: If7f27a5ac9b2232f394aac24552b37e6731df6d0 Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Diffstat (limited to 'android-cts')
-rwxr-xr-xandroid-cts/builders.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/android-cts/builders.sh b/android-cts/builders.sh
index 603e6fe2c9..aa58de0735 100755
--- a/android-cts/builders.sh
+++ b/android-cts/builders.sh
@@ -27,9 +27,15 @@ cp out/host/linux-x86/cts/android-cts.zip pub/
rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
+# need to convert '_' to '-'
+# otherwise, aosp_arm64-userdebug will be translated to '~aosp/arm64-userdebug'
+# when upload to snapshot.linaro.org via linaro-cp.py
+# like reported here:
+# https://ci.linaro.org/job/android-cts/20/console
+lunch_target_str=$(echo ${LUNCH_TARGET}|tr '_' '-')
# Publish parameters
cat << EOF > ${WORKSPACE}/publish_parameters
PUB_SRC=${PWD}/pub
-PUB_DEST=/android/${JOB_NAME}/${LUNCH_TARGET}/${BUILD_NUMBER}
+PUB_DEST=/android/${JOB_NAME}/${MANIFEST_BRANCH}/${lunch_target_str}/${BUILD_NUMBER}
PUB_EXTRA_INC=^[^/]+zip
EOF