From 9e3a1528b6b8b323be22cd29f22c6e6494db2777 Mon Sep 17 00:00:00 2001
From: Stuart Monteith <stuart.monteith@linaro.org>
Date: Mon, 31 Oct 2016 16:30:49 +0000
Subject: jdk: Update jdk9 jobs to match jdk8

JDK8 and JDK9 jobs should now be able to coexist. Change jdk9 jobs to
match the idioms in jdk8.

Couple of fixes in jdk8u.

Change-Id: Ifb9f68685ed5126b92141295e7b91eb6d1c3e061
---
 jdk9-jcstress-test-persist-results.yaml | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

(limited to 'jdk9-jcstress-test-persist-results.yaml')

diff --git a/jdk9-jcstress-test-persist-results.yaml b/jdk9-jcstress-test-persist-results.yaml
index 44cfc9dbf0..38108fa19d 100644
--- a/jdk9-jcstress-test-persist-results.yaml
+++ b/jdk9-jcstress-test-persist-results.yaml
@@ -6,12 +6,14 @@
         * Writes results to:<br>
           * /work/openjdk-testing/jcstress-nightly-runs<br>
           * /work/openjdk-testing/jcstress-results
-    logrotate:
-        numToKeep: 10
     properties:
         - authorization:
             linaro:
                 - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
     disabled: false
     node: aarch64-06
     display-name: 'OpenJDK 9 - Write jcstress tests results'
@@ -27,6 +29,11 @@
             name: BUILD_TYPE
             values:
                 - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - aarch64-06
     execution-strategy:
 #        combination-filter: |
 #            JVM_VARIANT=="server"
@@ -53,16 +60,27 @@
 
             set -exu
 
+            PERSIST=$HOME/srv/openjdk9
+
             : ${YEAR:=$(date +%Y)}
             : ${DAY_OF_YEAR:=$(date +%j)}
 
-            JCSTRESS_RUN_DIR=~openjdk-testing/jcstress-nightly-runs
-            JCSTRESS_RESULTS_DIR=~openjdk-testing/jcstress-results
+            JCSTRESS_RUN_DIR=$PERSIST/jcstress-nightly-runs
+            JCSTRESS_RESULTS_DIR=$PERSIST/jcstress-results
             RESULTS_CSV=${JCSTRESS_RESULTS_DIR}/results.csv
+
+            mkdir -p $JCSTRESS_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $RESULTS_CSV ]; then
+                touch $RESULTS_CSV
+            fi
+
             mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
-            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz 
+            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
             numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
             echo "Previous Results"
             cat ${RESULTS_CSV}
             echo "${numeric_date},${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR},success" >> ${RESULTS_CSV}
             sort --unique --field-separator=',' --numeric-sort -o ${RESULTS_CSV} ${RESULTS_CSV}
+
-- 
cgit v1.2.3