aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jdk8-jcstress-test-persist-results.yaml9
-rw-r--r--jdk8-jcstress-test-publish-results.yaml13
-rw-r--r--jdk8-jtreg-test-persist-results.yaml6
-rw-r--r--jdk8-jtreg-test-publish-results.yaml11
-rw-r--r--jdk8-jtreg-test.yaml4
-rw-r--r--jdk8-specjbb2013-benchmark-persist-results.yaml15
-rw-r--r--jdk8-specjbb2013-benchmark-publish-results.yaml4
-rw-r--r--jdk8-terasort-benchmark-persist-results.yaml13
-rw-r--r--jdk8-terasort-benchmark-publish-results.yaml5
9 files changed, 65 insertions, 15 deletions
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}
+
diff --git a/jdk8-jcstress-test-publish-results.yaml b/jdk8-jcstress-test-publish-results.yaml
index 036c2c5172..d843faa58f 100644
--- a/jdk8-jcstress-test-publish-results.yaml
+++ b/jdk8-jcstress-test-publish-results.yaml
@@ -20,8 +20,17 @@
- shell: |
#!/bin/bash
- export TOP_DIR=${HOME}
- ${HOME}/jcstress-test-scripts/jcstress-publish /home/openjdk-testing
+
+ PERSIST=$HOME/src/openjdk
+ SCRIPT_DIR=$PERSIST/jcstress-test-scripts
+ if [ -d $SCRIPT_DIR ]; then
+ (cd $SCRIPT_DIR; git pull)
+ else
+ git clone https://git.linaro.org/leg/openjdk/jcstress-test-scripts.git $SCRIPT_DIR
+ fi
+ export TOP_DIR=$PERSIST
+
+ $SCRIPT_DIR/jcstress-publish /home/openjdk-testing
publishers:
- email:
recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk8-jtreg-test-persist-results.yaml b/jdk8-jtreg-test-persist-results.yaml
index 9033239b14..e9893acfde 100644
--- a/jdk8-jtreg-test-persist-results.yaml
+++ b/jdk8-jtreg-test-persist-results.yaml
@@ -3,7 +3,7 @@
project-type: matrix
defaults: global
description: |
- * Writes the results to /work/openjdk-testing/openjdk8-jtreg-nightly-tests.
+ * Writes the results to $HOME/srv/openjdk/openjdk8-jtreg-nightly-tests.
logrotate:
numToKeep: 10
properties:
@@ -58,6 +58,8 @@
tree -f .
+ PERSIST=$HOME/srv/openjdk
+
result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
@@ -65,7 +67,7 @@
: ${YEAR:=$(date +%Y)}
: ${DAY_OF_YEAR:=$(date +%j)}
- basedir=~openjdk-testing/openjdk8-jtreg-nightly-tests
+ basedir=$PERSIST/openjdk8-jtreg-nightly-tests
src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
diff --git a/jdk8-jtreg-test-publish-results.yaml b/jdk8-jtreg-test-publish-results.yaml
index b42affd027..53bc92a994 100644
--- a/jdk8-jtreg-test-publish-results.yaml
+++ b/jdk8-jtreg-test-publish-results.yaml
@@ -26,10 +26,19 @@
set -ex
+ PERSIST=$HOME/srv/openjdk
+ SCRIPT_DIR=$PERSIST/openjdk-test-scripts
+ if [ -d $SCRIPT_DIR ]; then
+ (cd $SCRIPT_DIR; git pull)
+ else
+ git clone https://git.linaro.org/leg/openjdk/openjdk-test-scripts.git $SCRIPT_DIR
+ fi
+
+
tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
export PATH=${WORKSPACE}/jtreg/linux/bin:$PATH
which jtdiff
- TOP_DIR=~openjdk-testing/openjdk8-jtreg-nightly-tests bash -x ~openjdk-testing/openjdk-test-scripts/publish /home/openjdk-testing
+ TOP_DIR=$PERSIST/openjdk8-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PERSIST
publishers:
- email:
recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml
index f1e14b0ea5..cfded2bc7c 100644
--- a/jdk8-jtreg-test.yaml
+++ b/jdk8-jtreg-test.yaml
@@ -78,6 +78,8 @@
source incoming/build-date.sh
IMAGE_DIR=${WORKSPACE}/jdk8-${JVM_VARIANT}-${BUILD_TYPE}
+ PERSIST=$HOME/srv/openjdk
+
# Only set =1 for debugging.
use_subcategories=0
@@ -166,7 +168,7 @@
find ${work_dir} -name \*.class -exec rm {} \;
# Match the exact output of the cron-based scripts.
- dest=~openjdk-testing/openjdk8-jtreg-nightly-tests
+ dest=$PERSIST/openjdk8-jtreg-nightly-tests
sed_expr=$(echo s!${WORKSPACE}/${basedir}!$dest!g)
find ${work_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
diff --git a/jdk8-specjbb2013-benchmark-persist-results.yaml b/jdk8-specjbb2013-benchmark-persist-results.yaml
index 21c9105a3a..c46ce66b00 100644
--- a/jdk8-specjbb2013-benchmark-persist-results.yaml
+++ b/jdk8-specjbb2013-benchmark-persist-results.yaml
@@ -48,7 +48,18 @@
tree -f .
- source ~openjdk-testing/specjbb-test-scripts/common.sh
+ PERSIST=$HOME/srv/openjdk
+ TOPDIR=$PERSIST
+ mkdir -p $TOPDIR
+
+ SCRIPT_DIR=$PERSIST/specjbb-test-scripts
+ if [ -d $SCRIPT_DIR ]; then
+ (cd $SCRIPT_DIR; git pull)
+ else
+ git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
+ fi
+
+ source $SCRIPT_DIR/common.sh
echo "Previous Results"
cat ${RESULTS_CSV}
set -eux
@@ -58,4 +69,4 @@
cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
echo "Updating ${RESULTS_CSV}"
- ~openjdk-testing/specjbb-test-scripts/update-results-csv -- --verbose --output=${RESULTS_CSV}
+ $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk8-specjbb2013-benchmark-publish-results.yaml b/jdk8-specjbb2013-benchmark-publish-results.yaml
index f1ff5341ea..00321740d8 100644
--- a/jdk8-specjbb2013-benchmark-publish-results.yaml
+++ b/jdk8-specjbb2013-benchmark-publish-results.yaml
@@ -34,8 +34,10 @@
#!/bin/bash
set -exu
+ PERSIST=$HOME/srv/openjdk
+ TOPDIR=$PERSIST
- ~openjdk-testing/specjbb-test-scripts/specjbb-publish /home/openjdk-testing
+ $PERSIST/specjbb-test-scripts/specjbb-publish /home/openjdk-testing
publishers:
- email:
recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk8-terasort-benchmark-persist-results.yaml b/jdk8-terasort-benchmark-persist-results.yaml
index 96382a0996..82f66dc1be 100644
--- a/jdk8-terasort-benchmark-persist-results.yaml
+++ b/jdk8-terasort-benchmark-persist-results.yaml
@@ -44,8 +44,17 @@
set -exu
+ PERSIST=$HOME/srv/openjdk
+ BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/*.csv
- prev_results=~openjdk-testing/hadoop-terasort-benchmark-results/results.csv
+ prev_results=$BENCHMARK_RESULTS_DIR/results.csv
+
+ SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+ if [ -d $SCRIPT_DIR ]; then
+ (cd $SCRIPT_DIR; git pull)
+ else
+ git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+ fi
echo "Previous Results"
echo "----------------"
@@ -54,4 +63,4 @@
cat ${new_results} >> ${prev_results}
- ~openjdk-testing/hadoop-test-scripts/update-results-db
+ $SCRIPT_DIR/update-results-db
diff --git a/jdk8-terasort-benchmark-publish-results.yaml b/jdk8-terasort-benchmark-publish-results.yaml
index dade16d8a5..b08f8e96c7 100644
--- a/jdk8-terasort-benchmark-publish-results.yaml
+++ b/jdk8-terasort-benchmark-publish-results.yaml
@@ -34,8 +34,11 @@
builders:
- shell: |
#!/bin/bash
+ PERSIST=$HOME/src/openjdk
+ BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+ SCRIPT_DIR=$PERSIST/hadoop-test-scripts
- ${HOME}/hadoop-test-scripts/benchmark-terasort-publish /home/openjdk-testing
+ $SCRIPT_DIR/benchmark-terasort-publish /home/openjdk-testing
publishers:
- email:
recipients: 'fathi.boudra@linaro.org'
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 22:38:06 +0000