From 2877220f2d02a74fc3ba5a73b94f2d4ee2ccd718 Mon Sep 17 00:00:00 2001
From: Stuart Monteith <stuart.monteith@linaro.org>
Date: Mon, 8 Aug 2016 16:05:02 +0100
Subject: jdk8: Replace ~openjdk-testing from the paths.

Adds "PERSIST" variable which currently points to "$HOME/srv/openjdk".
This removes a dependency on the ~openjdk-testing userid, which won't
ever exist on ci.linaro.org.

Removes dependency on the *-test-scripts directories being already
checked out. Instead, the "jdk8-*-persist" jobs check out the test
scripts and the "jdk8-*-publish" jobs reuse them.

Change-Id: Id25f1f1ac2e9a33f63cb393b6f1e8c7eb3dee2e0
---
 jdk8-jcstress-test-persist-results.yaml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

diff --git a/jdk8-jcstress-test-persist-results.yaml b/jdk8-jcstress-test-persist-results.yaml
index 2e5d69b37a..d1e6f830c2 100644
--- a/jdk8-jcstress-test-persist-results.yaml
+++ b/jdk8-jcstress-test-persist-results.yaml
@@ -53,16 +53,19 @@
 
             set -exu
 
+            PERSIST=$HOME/srv/openjdk
+
             : ${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} ${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}/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