android: conversion to new Android Publisher, initial batch

If these jobs make it, then the rest will do too.

Change-Id: I7e107240f05976c513a0c027fe75a178d2253fc8
Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org>

4 files changed, 49 insertions, 55 deletions

diff --git a/96boards-hikey-aosp-master.yaml b/96boards-hikey-aosp-master.yaml
index eff0fbf16e..5a55181ad5 100644
--- a/96boards-hikey-aosp-master.yaml
+++ b/96boards-hikey-aosp-master.yaml
@@ -27,8 +27,6 @@
         - timeout:
             timeout: 500
     builders:
-        - linaro-publish-token:
-            host: builds.96boards.org
         - shell: |
             #!/bin/bash
 
@@ -40,12 +38,11 @@
 
             wget -q http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
               http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
-             http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+              http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
             sudo dpkg -i --force-all *.deb
 
             mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
             curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
             chmod a+x ${HOME}/bin/*
             export PATH=${HOME}/bin:${PATH}
 
@@ -67,6 +64,13 @@
 
             export BUILD_CONFIG_FILENAME=${BUILD_CONFIG_FILENAME:-${JOB_NAME#android-*}}
 
+            # Early test
+            if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
+              echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
+              echo "in android-build-configs.git"
+              exit 1
+            fi
+
             cat << EOF > config.txt
             BUILD_CONFIG_REPO=http://android-git.linaro.org/git/android-build-configs.git
             BUILD_CONFIG_BRANCH=master
@@ -82,6 +86,7 @@
             yes "I ACCEPT" | ./extract-linaro-hikey.sh
             cd -
 
+            # Build Android
             build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
             cp -a /home/buildslave/srv/${JOB_NAME}/build/out/*.xml /home/buildslave/srv/${JOB_NAME}/build/out/*.json ${WORKSPACE}/
 
@@ -90,9 +95,6 @@
             out/host/linux-x86/bin/make_ext4fs -s -T -1 -S out/root/file_contexts -L data -l 1342177280 -a data out/userdata-4gb.img out/data
             cd -
 
-            # Publish
-            PUB_DEST=snapshots/hikey/linaro/aosp-master/${BUILD_NUMBER}
-
             cd build/out
             rm -f ramdisk.img
             for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img"; do
@@ -104,27 +106,14 @@
             rm -rf build/out/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/out/BUILD-INFO.txt
 
-            time linaro-cp.py \
-              --manifest \
-              --no-build-info \
-              --link-latest \
-              --split-job-owner \
-              --server ${PUBLISH_SERVER} \
-              build/out \
-              ${PUB_DEST} \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|config)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS)$"
+            # Publish parameters
+            cat << EOF > ${WORKSPACE}/publish_parameters
+            PUB_DEST=snapshots/hikey/linaro/aosp-master/${BUILD_NUMBER}
+            PUB_SRC=${PWD}/build/out
+            EOF
 
             # Construct post-build-lava parameters
-            if [ -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-              source build-configs/${BUILD_CONFIG_FILENAME}
-            else
-              echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-              echo "in android-build-configs.git"
-              exit 1
-            fi
-
+            source build-configs/${BUILD_CONFIG_FILENAME}
             cat << EOF > ${WORKSPACE}/post_build_lava_parameters
             DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
             TARGET_PRODUCT=${TARGET_PRODUCT}
@@ -138,8 +127,13 @@
             DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
             CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-boot.json
             EOF
-
-            echo "Build finished"
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token:
+            host: builds.96boards.org
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
         - trigger-builds:
             - project: 'post-build-lava'
               property-file: post_build_lava_parameters
diff --git a/android-lcr/hikey/builders.sh b/android-lcr/hikey/builders.sh
index 16f5d18e35..aea63bbefa 100755
--- a/android-lcr/hikey/builders.sh
+++ b/android-lcr/hikey/builders.sh
@@ -1,5 +1,11 @@
-# Build Android
-## clean android-patchsets and repositories in device
+# Early test
+if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
+  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
+  echo "in android-build-configs.git"
+  exit 1
+fi
+
+# Clean android-patchsets and repositories in device
 rm -rf build/out build/android-patchsets build/device
 
 mkdir -p build/
@@ -9,6 +15,7 @@ tar -xvf linaro-hikey-20160226-67c37b1a.tgz
 yes "I ACCEPT" | ./extract-linaro-hikey.sh
 cd -
 
+# Build Android
 build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
 cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
 
@@ -28,29 +35,14 @@ cd -
 rm -rf build/out/BUILD-INFO.txt
 wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/template.txt -O build/out/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 \
-  build/out \
-  ${PUB_DEST} \
-  --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|config)$" \
-  --include "^[BHi][^/]+txt$" \
-  --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_SRC=${PWD}/build/out
+PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
+EOF
 
 # Construct post-build-lava parameters
-if [ -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-  source build-configs/${BUILD_CONFIG_FILENAME}
-else
-  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-  echo "in android-build-configs.git"
-  exit 1
-fi
-
+source build-configs/${BUILD_CONFIG_FILENAME}
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
 DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
 TARGET_PRODUCT=${TARGET_PRODUCT}
@@ -65,5 +57,3 @@ DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
 CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template.json
 SKIP_REPORT=false
 EOF
-
-echo "Build finished"
diff --git a/android-lcr/hikey/builders.yaml.inc b/android-lcr/hikey/builders.yaml.inc
index 5d3524be3e..a099366db4 100644
--- a/android-lcr/hikey/builders.yaml.inc
+++ b/android-lcr/hikey/builders.yaml.inc
@@ -1,8 +1,13 @@
-        - linaro-publish-token
         - shell:
             !include-raw:
                 - android-lcr/common/builders.sh
                 - android-lcr/hikey/builders.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
         - trigger-builds:
             - project: 'post-build-lava'
               property-file: post_build_lava_parameters
diff --git a/android-lcr/hikey/premerge-ci-builders.yaml.inc b/android-lcr/hikey/premerge-ci-builders.yaml.inc
index 46c418ab16..bbaf59e809 100644
--- a/android-lcr/hikey/premerge-ci-builders.yaml.inc
+++ b/android-lcr/hikey/premerge-ci-builders.yaml.inc
@@ -1,8 +1,13 @@
-        - linaro-publish-token
         - shell:
             !include-raw:
                 - android-lcr/common/builders.sh
                 - android-lcr/hikey/builders.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
         - trigger-builds:
             - project: 'post-build-lava'
               property-file: post_build_lava_parameters