From 68cbf41816f825b13f4896f04ddf2652a3f0d4cf Mon Sep 17 00:00:00 2001
From: Stuart Monteith <stuart.monteith@linaro.org>
Date: Mon, 22 Aug 2016 18:24:40 +0100
Subject: jdk8: Fix paths in SPECjbb2013 write results job

The path is wrong for incoming artifacts - add label.
Also, the job seems out of date on jenkins compared to Jenkins.

Change-Id: I67709a11cd83777ddda59042f368aaa028ecab01
---
 jdk8-specjbb2013-benchmark-persist-results.yaml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'jdk8-specjbb2013-benchmark-persist-results.yaml')

diff --git a/jdk8-specjbb2013-benchmark-persist-results.yaml b/jdk8-specjbb2013-benchmark-persist-results.yaml
index c8c343fab4..10ac807146 100644
--- a/jdk8-specjbb2013-benchmark-persist-results.yaml
+++ b/jdk8-specjbb2013-benchmark-persist-results.yaml
@@ -29,6 +29,11 @@
             name: BUILD_TYPE
             values:
                 - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - aarch64-06
     execution-strategy:
 #        combination-filter: |
 #            JVM_VARIANT=="server"
@@ -65,7 +70,7 @@
             echo "Previous Results"
             cat ${RESULTS_CSV}
             set -eux
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
             [ -e $result_tarball ] || exit 1
             tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
             cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
-- 
cgit v1.2.3