aboutsummaryrefslogtreecommitdiff
path: root/android-tv
diff options
context:
space:
mode:
authorDaniel Díaz <daniel.diaz@linaro.org>2017-01-06 13:33:54 -0600
committerVishal Bhoj <vishal.bhoj@linaro.org>2017-02-02 02:22:54 +0000
commit0967bf0af1cd8efa571de7b1afb9633b589767d2 (patch)
tree26032fc86dcc703e4144ed592455fb7ea6507f43 /android-tv
parent69ae518077fdbdf4fae75ef8a9c6f20c425cb241 (diff)
android: conversion to new Android Publisher, rest of jobs
Change-Id: Id4491af6e9f16c28b153b215c3894067e2efc032 Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>
Diffstat (limited to 'android-tv')
-rwxr-xr-xandroid-tv/hikey/builders.sh20
-rw-r--r--android-tv/hikey/builders.yaml.inc7
2 files changed, 11 insertions, 16 deletions
diff --git a/android-tv/hikey/builders.sh b/android-tv/hikey/builders.sh
index e1d20326ef..3512ffbd3d 100755
--- a/android-tv/hikey/builders.sh
+++ b/android-tv/hikey/builders.sh
@@ -58,18 +58,8 @@ done
rm -rf BUILD-INFO.txt
wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O BUILD-INFO.txt
-# Publish binaries
-PUB_DEST=/android/$JOB_NAME/$BUILD_NUMBER
-time linaro-cp.py \
- --api_version 3 \
- --manifest \
- --no-build-info \
- --link-latest \
- --split-job-owner \
- ./ \
- ${PUB_DEST} \
- --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|config)$" \
- --include "^[BHi][^/]+txt$" \
- --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-
-echo "Build finished"
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_SRC=${PWD}/build/out
+PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
+EOF
diff --git a/android-tv/hikey/builders.yaml.inc b/android-tv/hikey/builders.yaml.inc
index 7d7116a2d5..8bc262a426 100644
--- a/android-tv/hikey/builders.yaml.inc
+++ b/android-tv/hikey/builders.yaml.inc
@@ -1,5 +1,10 @@
- - linaro-publish-token
- shell:
!include-raw:
- android-lcr/common/builders.sh
- android-tv/hikey/builders.sh
+ - inject:
+ properties-file: publish_parameters
+ - linaro-publish-token
+ - shell:
+ !include-raw:
+ - android/linaro-publisher.sh