From 8a9a67d6a0df2442b02c970d95f004a0fd12045a Mon Sep 17 00:00:00 2001
From: Renato Golin <renato.golin@linaro.org>
Date: Tue, 2 May 2017 16:50:25 +0100
Subject: tcwg-llvm-*: Mock up to test Jenkins matrix jobs

Change-Id: I7ad12dcc22ff3afa884437ffa9a93097f4622313
---
 tcwg-llvm-staged-build.yaml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'tcwg-llvm-staged-build.yaml')

diff --git a/tcwg-llvm-staged-build.yaml b/tcwg-llvm-staged-build.yaml
index 64b75aeff0..48850bf055 100644
--- a/tcwg-llvm-staged-build.yaml
+++ b/tcwg-llvm-staged-build.yaml
@@ -86,21 +86,23 @@
             set -ex
 
             # Select builder arch/type/container
-            buildjobs=7
+            buildjobs=1
             triple=""
             case ${label} in
                 tcwg-x86_64-build)
                     builder_arch=amd64
                     triple="x86_64-unknown-linux-gnu"
+                    buildjobs=8 # 1 slot is 32/4
                     ;;
                 tcwg-tk1_32-build)
                     builder_arch=armhf
-                    triple="armv7-unknown-linux-gnueabihf"
+                    triple="armv7l-unknown-linux-gnueabihf"
                     buildjobs=4 # TK1s only have 4 cores
                     ;;
                 tcwg-apm_64-build)
                     builder_arch=arm64
                     triple="aarch64-unknown-linux-gnu"
+                    buildjobs=4 # APMs only have 8 cores
                     ;;
                 *) echo "ERROR: Unsupported label: $label"; exit 1 ;;
             esac
@@ -121,18 +123,19 @@
                 trap "${CONTAINERS_CLEANUP}" EXIT
             fi
 
-            # Setup job parameters and run
+            # Setup job parameters and run (for now, just pretend to run)
             linkjobs=7
             buildid="ci${BUILD_ID}"
             if [ ! -z ${revision} ]; then
               buildid=${revision}
             fi
-            ${BUILD_CONTAINER} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/tcwg-llvm-build.sh \
+            echo ${BUILD_CONTAINER} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/tcwg-llvm-build.sh \
                 --workspace=${WORKSPACE} \
                 --buildid=${buildid} \
                 --linkjobs=${linkjobs} \
                 --revision=${revision} \
                 --toolchain=${toolchain}"
+            touch clang+llvm-${buildid}-${triple}.tar.xz
 
             # Chained jobs (FIXME: handle targets)
             fileserver=dev-01.tcwglab
-- 
cgit v1.2.3