diff options
author | Daniel Díaz <daniel.diaz@linaro.org> | 2017-01-06 13:33:54 -0600 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2017-02-02 02:22:54 +0000 |
commit | 0967bf0af1cd8efa571de7b1afb9633b589767d2 (patch) | |
tree | 26032fc86dcc703e4144ed592455fb7ea6507f43 /android-lcr/generic | |
parent | 69ae518077fdbdf4fae75ef8a9c6f20c425cb241 (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-lcr/generic')
-rwxr-xr-x | android-lcr/generic/builders.sh | 18 | ||||
-rw-r--r-- | android-lcr/generic/builders.yaml.inc | 7 |
2 files changed, 10 insertions, 15 deletions
diff --git a/android-lcr/generic/builders.sh b/android-lcr/generic/builders.sh index f9d62c7e48..b21ee58481 100755 --- a/android-lcr/generic/builders.sh +++ b/android-lcr/generic/builders.sh @@ -30,18 +30,8 @@ if [ "${BUILD_TYPE}" = "public" ]; then fi wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/generic/build-info/${template} -O ${ANDROID_PRODUCT_OUT}/BUILD-INFO.txt -# Publish binaries +# Publish parameters +cat << EOF > ${WORKSPACE}/publish_parameters +PUB_SRC=$(readlink -f ${ANDROID_PRODUCT_OUT}) PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}/${LUNCH_TARGET} -time linaro-cp.py \ - --api_version 3 \ - --manifest \ - --no-build-info \ - --link-latest \ - --split-job-owner \ - ${ANDROID_PRODUCT_OUT} \ - ${PUB_DEST} \ - --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|config)$" \ - --include "^[BHi][^/]+txt$" \ - --include "^(MANIFEST|MD5SUMS|changelog.txt)$" - -echo "Build finished" +EOF diff --git a/android-lcr/generic/builders.yaml.inc b/android-lcr/generic/builders.yaml.inc index e20df94593..ef5c19b3bc 100644 --- a/android-lcr/generic/builders.yaml.inc +++ b/android-lcr/generic/builders.yaml.inc @@ -1,5 +1,10 @@ - - linaro-publish-token - shell: !include-raw: - android-lcr/common/builders.sh - android-lcr/generic/builders.sh + - inject: + properties-file: publish_parameters + - linaro-publish-token + - shell: + !include-raw: + - android/linaro-publisher.sh |