android-master-clang: use include-raw

Move the shell step to a separate script included with include-raw.
Split the publishing step into its own step.
Use pxz for parallel xz compression.

Don't build clang toolchain but use the prebuilt from clang
toolchain build.

Change-Id: I90e6c08967f1553b42e1b9dcc0e435fd4af69ac7
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

1 files changed, 15 insertions, 61 deletions

diff --git a/android-master-clang.yaml b/android-master-clang.yaml
index 4301203bea..74b07358e4 100644
--- a/android-master-clang.yaml
+++ b/android-master-clang.yaml
@@ -13,6 +13,13 @@
         - build-discarder:
             days-to-keep: 60
             num-to-keep: 60
+    parameters:
+        - string:
+            name: CLANG_TOOLCHAIN_URL
+            default: http://snapshots.linaro.org/android/android-clang-toolchain/8/
+        - string:
+            name: BUILD_CONFIG_FILENAME
+            default: 'hikey-aosp-master'
     disabled: false
     node: docker-utopic-aosp
     display-name: 'AOSP Master built with upstream Clang toolchain'
@@ -21,80 +28,27 @@
         - timeout:
             timeout: 500
     builders:
+        - shell:
+            !include-raw: android-master-clang/builders.sh
         - linaro-publish-token
         - shell: |
             #!/bin/bash
 
-            # Download linaro-cp
-            mkdir -p ${HOME}/bin
-            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}
-
-            sudo apt-get update
-            sudo apt-get install -y libxml2-dev zlib1g-dev libtinfo-dev git-svn gawk libxml2-utils rsync
-
-            wget -q \
-              http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
-              http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
-              http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb \
-              https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.sh
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            yes y | bash cmake-3.5.2-Linux-x86_64.sh
-            export PATH=${PWD}/cmake-3.5.2-Linux-x86_64/bin/:${PATH}
-
-            # Generate fat partition hikey image for LAVA.
-            export TARGET_BOOTIMAGE_USE_FAT=true
-            mkdir -p /home/buildslave/srv/${JOB_NAME}
-            cd /home/buildslave/srv/${JOB_NAME}
-            if [ -e aosp_uclang ]; then
-              cd aosp_uclang/
-              git pull origin master
-              cd -
-            else
-              git clone http://git.linaro.org/git/people/minseong.kim/aosp_uclang.git
-            fi
-            (cd aosp_uclang && bash aosp-uclang-init-and-build.sh)
-            cd /home/buildslave/srv/${JOB_NAME}/aosp_uclang/aosp_master/out/target/product/hikey/
-            for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img"; do
-                echo "Compressing ${image}"
-                xz ${image}
-            done
-
-            wget -q 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 \
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
+            time python ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --manifest \
               --no-build-info \
               --link-latest \
               --split-job-owner \
-              ./ \
+              ${HOME}/srv/${JOB_NAME}/build/out \
               ${PUB_DEST} \
               --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|config)$" \
               --include "^[BHi][^/]+txt$" \
               --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-
-             cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-             DEVICE_TYPE=hikey
-             TARGET_PRODUCT=hikey
-             MAKE_TARGETS=droidcore
-             JOB_NAME=${JOB_NAME}
-             BUILD_NUMBER=${BUILD_NUMBER}
-             IMAGE_EXTENSION=img.xz
-             BUILD_URL=${BUILD_URL}
-             LAVA_SERVER=validation.linaro.org/RPC2/
-             IMAGE_EXTENSION=img.xz
-             FRONTEND_JOB_NAME=${JOB_NAME}
-             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"
         - trigger-builds:
             - project: 'post-build-lava'
               property-file: post_build_lava_parameters