aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jdk8-generate-email-report.yaml2
-rw-r--r--jdk8-jtreg-test-persist-results.yaml4
-rw-r--r--jdk9-build-and-test.yaml10
-rw-r--r--jdk9-build-image.yaml13
-rw-r--r--jdk9-email-results.yaml35
-rw-r--r--jdk9-generate-email-report.yaml20
-rw-r--r--jdk9-jcstress-test-persist-results.yaml28
-rw-r--r--jdk9-jcstress-test-publish-results.yaml32
-rw-r--r--jdk9-jcstress-test.yaml9
-rw-r--r--jdk9-jtreg-test-persist-results.yaml30
-rw-r--r--jdk9-jtreg-test-publish-results.yaml40
-rw-r--r--jdk9-jtreg-test.yaml16
-rw-r--r--jdk9-persist-all-results.yaml6
-rw-r--r--jdk9-publish-all-results.yaml15
-rw-r--r--jdk9-specjbb2013-benchmark-persist-results.yaml34
-rw-r--r--jdk9-specjbb2013-benchmark-publish-results.yaml22
-rw-r--r--jdk9-specjbb2013-benchmark.yaml8
-rw-r--r--jdk9-terasort-benchmark-persist-results.yaml37
-rw-r--r--jdk9-terasort-benchmark-publish-results.yaml31
-rw-r--r--jdk9-terasort-benchmark.yaml8
-rw-r--r--jdk9-update-src-tree-persist.yaml11
-rw-r--r--jdk9-update-src-tree.yaml9
22 files changed, 314 insertions, 106 deletions
diff --git a/jdk8-generate-email-report.yaml b/jdk8-generate-email-report.yaml
index 3718e0205..432209030 100644
--- a/jdk8-generate-email-report.yaml
+++ b/jdk8-generate-email-report.yaml
@@ -65,7 +65,7 @@
${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
echo "" >> ${WORKSPACE}/report.txt
- TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/staging >> ${WORKSPACE}/report.txt
+ TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/${JDK_VERSION} >> ${WORKSPACE}/report.txt
publishers:
- archive:
artifacts: 'report.txt'
diff --git a/jdk8-jtreg-test-persist-results.yaml b/jdk8-jtreg-test-persist-results.yaml
index 512dd51d8..04d5fb968 100644
--- a/jdk8-jtreg-test-persist-results.yaml
+++ b/jdk8-jtreg-test-persist-results.yaml
@@ -58,7 +58,7 @@
flatten: true
- copyartifact:
project: jdk8-build-image
- filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
+ filter: 'out/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
target: incoming
flatten: true
- shell: |
@@ -73,7 +73,7 @@
result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
- image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+ image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
: ${YEAR:=$(date +%Y)}
: ${DAY_OF_YEAR:=$(date +%j)}
diff --git a/jdk9-build-and-test.yaml b/jdk9-build-and-test.yaml
index 207be190d..b39f96663 100644
--- a/jdk9-build-and-test.yaml
+++ b/jdk9-build-and-test.yaml
@@ -7,14 +7,18 @@
* <b>Note:</b> this job is usually triggered by a source change (ie. the "jdk9-update-src-tree" job).<br>
If it is run manually it will use the source tarball from the last successful build of that job.<br>
* If this jobs runs to completion the results are published to http://openjdk.linaro.org/.
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
disabled: false
node: master
display-name: 'OpenJDK 9 - Build jdk images and run tests/benchmarks'
diff --git a/jdk9-build-image.yaml b/jdk9-build-image.yaml
index a8ffb8767..d900cd4f4 100644
--- a/jdk9-build-image.yaml
+++ b/jdk9-build-image.yaml
@@ -6,18 +6,22 @@
* Configures and builds jdk9 (ie, bin/java, bin/javac, et al) for various configurations.<br>
* The source tarball is copied from the jdk9-update-src-tree job.<br>
* <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
parameters:
- string:
name: JDK_URL
- default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1605.tar.xz'
+ default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1609.tar.xz'
disabled: false
node: aarch64-06
display-name: 'OpenJDK 9 - Configure and build OpenJDK 9'
@@ -27,6 +31,7 @@
name: JVM_VARIANT
values:
- server
+# SRDM: Disabled while LEG-347 is being fixed.
# - client
- axis:
type: user-defined
diff --git a/jdk9-email-results.yaml b/jdk9-email-results.yaml
index c1038dd80..dc5ef5c32 100644
--- a/jdk9-email-results.yaml
+++ b/jdk9-email-results.yaml
@@ -5,17 +5,18 @@
description: |
* Sends the report.txt file to the aarch64-port-dev mailing list.<br>
* The text report is copied from the jdk9-generate-text-report job.
- logrotate:
- numToKeep: 10
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
- parameters:
- - string:
- name: RECIPIENTS
- default: 'fathi.boudra@linaro.org'
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
disabled: false
node: master
display-name: 'OpenJDK 9 - Send e-mail report'
@@ -25,17 +26,11 @@
- copyartifact:
project: jdk9-generate-email-report
filter: 'report.txt'
- - shell: |
- #!/bin/bash
-
- FROM="OpenJDK Testing <openjdk-testing@linaro.org>"
- SUBJECT="JTREG, SPECjbb2013 and Hadoop/Terasort results for OpenJDK 9 on AArch64"
- MSG=$(cat report.txt)
-
- cat <<EOF | /usr/sbin/sendmail -t
- From: ${FROM}
- To: ${RECIPIENTS}
- Subject: ${SUBJECT}
-
- ${MSG}
- EOF
+ publishers:
+ - email-ext:
+ recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org'
+ subject: 'JTREG, SPECjbb2013 and Hadoop/Terasort results for OpenJDK 9 on AArch64'
+ content-type: text
+ body: |
+ ${FILE,path="report.txt"}
+ success: true
diff --git a/jdk9-generate-email-report.yaml b/jdk9-generate-email-report.yaml
index d26561663..6d48e6f3a 100644
--- a/jdk9-generate-email-report.yaml
+++ b/jdk9-generate-email-report.yaml
@@ -11,14 +11,18 @@
* specjbb<br>
<br>
in text form suitable for the aarch64-port-dev mailing list.
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
parameters:
- string:
name: ZERO_BASELINE
@@ -48,18 +52,20 @@
tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
PATH=${WORKSPACE}/jtreg/bin:${PATH}
+ PERSIST=$HOME/srv/openjdk9
+ JDK_VERSION=9
which jtdiff
- TOP_DIR=${HOME}/openjdk9-jtreg-nightly-tests ${HOME}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
+ TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
echo "" >> ${WORKSPACE}/report.txt
- ${HOME}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
+ TOP_DIR=${PERSIST} ${PERSIST}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
echo "" >> ${WORKSPACE}/report.txt
- ${HOME}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
+ ${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
echo "" >> ${WORKSPACE}/report.txt
- TOP_DIR=${HOME} ${HOME}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/ >> ${WORKSPACE}/report.txt
+ TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/${JDK_VERSION} >> ${WORKSPACE}/report.txt
publishers:
- archive:
artifacts: 'report.txt'
diff --git a/jdk9-jcstress-test-persist-results.yaml b/jdk9-jcstress-test-persist-results.yaml
index 44cfc9dbf..38108fa19 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}
+
diff --git a/jdk9-jcstress-test-publish-results.yaml b/jdk9-jcstress-test-publish-results.yaml
index c95328b17..e0b053227 100644
--- a/jdk9-jcstress-test-publish-results.yaml
+++ b/jdk9-jcstress-test-publish-results.yaml
@@ -4,24 +4,48 @@
defaults: global
description: |
* Reports are published to http://openjdk.linaro.org/jcstress-nightly-runs/
- logrotate:
- numToKeep: 10
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
+ parameters:
+ - string:
+ name: PUBLISH_DEST
+ default: ''
+ - string:
+ name: PUBLISH_HOST
+ default: ''
disabled: false
node: aarch64-06
display-name: 'OpenJDK 9 - Publish jcstress report'
wrappers:
- timestamps
+ - ssh-agent-credentials:
+ # openjdk-testing user id
+ users:
+ - '744cffb4-9ce1-4856-b103-9fdda06dad36'
builders:
- shell: |
#!/bin/bash
- export TOP_DIR=${HOME}
- ${HOME}/jcstress-test-scripts/jcstress-publish /home/openjdk-testing
+
+ PERSIST=$HOME/srv/openjdk9
+ SCRIPT_DIR=$PERSIST/jcstress-test-scripts
+ JDK_VERSION=9
+
+ 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 $PUBLISH_DEST
publishers:
- email:
recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk9-jcstress-test.yaml b/jdk9-jcstress-test.yaml
index 5c97c4c07..6a9955a2e 100644
--- a/jdk9-jcstress-test.yaml
+++ b/jdk9-jcstress-test.yaml
@@ -6,13 +6,14 @@
This job runs the http://openjdk.java.net/projects/code-tools/jcstress/ tests.<br>
<b>Note:</b> this test currently takes around <b>10 hours</b> to complete<br>
This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
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 - Run jcstress tests'
@@ -62,7 +63,7 @@
set -eu
TEST_TYPE=all
- TEST_MODE=default
+ TEST_MODE=sanity
JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar
rm -rf jdk9*
diff --git a/jdk9-jtreg-test-persist-results.yaml b/jdk9-jtreg-test-persist-results.yaml
index dc49567de..06a5f08c5 100644
--- a/jdk9-jtreg-test-persist-results.yaml
+++ b/jdk9-jtreg-test-persist-results.yaml
@@ -3,13 +3,18 @@
project-type: matrix
defaults: global
description: |
- * Writes the results to /work/openjdk-testing/openjdk9-jtreg-nightly-tests.
- logrotate:
- numToKeep: 10
+ * Writes the results to $HOME/srv/openjdk9/openjdk-jtreg-nightly-tests.
properties:
- authorization:
linaro:
- job-read
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - 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 jtreg tests results'
@@ -19,7 +24,8 @@
name: JVM_VARIANT
values:
- server
- - client
+# SRDM: Disable client runs while waiting for LEG-347 to be fixed.
+# - client
- axis:
type: user-defined
name: BUILD_TYPE
@@ -32,6 +38,11 @@
- hotspot
- langtools
- jdk
+ - axis:
+ type: slave
+ name: label
+ values:
+ - aarch64-06
execution-strategy:
sequential: true
wrappers:
@@ -58,18 +69,21 @@
tree -f .
- 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
+ PERSIST=$HOME/srv/openjdk9
+ JDK_VERSION=9
+
+ result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
- image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+ image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
: ${YEAR:=$(date +%Y)}
: ${DAY_OF_YEAR:=$(date +%j)}
- basedir=~openjdk-testing/openjdk9-jtreg-nightly-tests
+ basedir=$PERSIST/openjdk-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
- image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/images/j2sdk-image
+ image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
mkdir -p ${image_dir}
diff --git a/jdk9-jtreg-test-publish-results.yaml b/jdk9-jtreg-test-publish-results.yaml
index 7cddfa875..f933dcc7a 100644
--- a/jdk9-jtreg-test-publish-results.yaml
+++ b/jdk9-jtreg-test-publish-results.yaml
@@ -3,19 +3,34 @@
project-type: freestyle
defaults: global
description: |
- * Results are published to http://openjdk.linaro.org/openjdk9-jtreg-nightly-tests/
- logrotate:
- numToKeep: 10
+ * Results are published to http://openjdk.linaro.org/jdk9/openjdk-jtreg-nightly-tests/
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
+ parameters:
+ - string:
+ name: PUBLISH_DEST
+ default: ''
+ - string:
+ name: PUBLISH_HOST
+ default: ''
disabled: false
node: aarch64-06
display-name: 'OpenJDK 9 - Publish jtreg results'
wrappers:
- timestamps
+ - ssh-agent-credentials:
+ users:
+ - '744cffb4-9ce1-4856-b103-9fdda06dad36'
builders:
- copyartifact:
project: jtreg-build
@@ -26,10 +41,25 @@
set -ex
+ PERSIST=$HOME/srv/openjdk9
+ SCRIPT_DIR=$PERSIST/openjdk-test-scripts
+ JDK_VERSION=9
+
+ (unset PRIVATE_KEY; env | sort >$WORKSPACE/env.out)
+ tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
+
+ 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/bin:$PATH
which jtdiff
- TOP_DIR=~openjdk-testing/openjdk9-jtreg-nightly-tests bash -x ~openjdk-testing/openjdk-test-scripts/publish /home/openjdk-testing
+ TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
publishers:
+ - archive:
+ artifacts: 'tree.out.xz, env.out'
- email:
- recipients: 'fathi.boudra@linaro.org'
+ recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-jtreg-test.yaml b/jdk9-jtreg-test.yaml
index 37aa1edea..e29ba023a 100644
--- a/jdk9-jtreg-test.yaml
+++ b/jdk9-jtreg-test.yaml
@@ -4,13 +4,17 @@
defaults: global
description: |
* Runs the jtreg tests.
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
properties:
- authorization:
linaro:
- job-read
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
disabled: false
node: aarch64-06
display-name: 'OpenJDK 9 - Run jtreg tests'
@@ -20,6 +24,7 @@
name: JVM_VARIANT
values:
- server
+# SRDM: Disable client runs while waiting for LEG-347 to be fixed.
# - client
- axis:
type: user-defined
@@ -77,7 +82,10 @@
source incoming/build-date.sh
+ JDK_VERSION=9
IMAGE_DIR=${WORKSPACE}/jdk9-${JVM_VARIANT}-${BUILD_TYPE}
+ PERSIST=$HOME/srv/openjdk9
+
# Only set =1 for debugging.
use_subcategories=0
@@ -166,7 +174,7 @@
find ${work_dir} -name \*.class -exec rm {} \;
# Match the exact output of the cron-based scripts.
- dest=~openjdk-testing/openjdk9-jtreg-nightly-tests
+ dest=$PERSIST/openjdk-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/jdk9-persist-all-results.yaml b/jdk9-persist-all-results.yaml
index aa3a33a85..0fc6645a9 100644
--- a/jdk9-persist-all-results.yaml
+++ b/jdk9-persist-all-results.yaml
@@ -4,13 +4,15 @@
defaults: global
description: |
* This job persist all results.
- logrotate:
- numToKeep: 10
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
disabled: false
node: master
display-name: 'OpenJDK 9 - Persist all results'
diff --git a/jdk9-publish-all-results.yaml b/jdk9-publish-all-results.yaml
index 636b0f13b..d5220dec3 100644
--- a/jdk9-publish-all-results.yaml
+++ b/jdk9-publish-all-results.yaml
@@ -4,13 +4,18 @@
defaults: global
description: |
* Convenience job to invoke all the scripts that sync the results to openjdk.linaro.org.
- logrotate:
- numToKeep: 10
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ openjdk-members:
+ - job-build
+ - job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
disabled: false
node: master
display-name: 'OpenJDK 9 - Invoke all the scripts to sync results to openjdk.linaro.org'
@@ -20,15 +25,19 @@
- trigger-builds:
- project: jdk9-jtreg-test-publish-results
block: true
+ current-parameters: true
- trigger-builds:
- project: jdk9-specjbb2013-benchmark-publish-results
block: true
+ current-parameters: true
- trigger-builds:
- project: jdk9-terasort-benchmark-publish-results
block: true
+ current-parameters: true
- trigger-builds:
- project: jdk9-jcstress-test-publish-results
block: true
+ current-parameters: true
publishers:
- email:
- recipients: 'fathi.boudra@linaro.org'
+ recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-specjbb2013-benchmark-persist-results.yaml b/jdk9-specjbb2013-benchmark-persist-results.yaml
index 262379630..aa3edbe3d 100644
--- a/jdk9-specjbb2013-benchmark-persist-results.yaml
+++ b/jdk9-specjbb2013-benchmark-persist-results.yaml
@@ -6,12 +6,14 @@
* Writes the results to /work/openjdk-testing/SPECjbb2013-1.00-nightly-runs.<br>
* This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
* If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
- 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 SPECjbb2013 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"
@@ -48,14 +55,29 @@
tree -f .
- source ~openjdk-testing/specjbb-test-scripts/common.sh
+ PERSIST=$HOME/srv/openjdk9
+ TOP_DIR=$PERSIST
+ mkdir -p $TOP_DIR
+
+ 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
+
+ # Ensure nightly results dir exists.
+ mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
+
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}
+ cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.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/jdk9-specjbb2013-benchmark-publish-results.yaml b/jdk9-specjbb2013-benchmark-publish-results.yaml
index c25bf4ddd..484de07d6 100644
--- a/jdk9-specjbb2013-benchmark-publish-results.yaml
+++ b/jdk9-specjbb2013-benchmark-publish-results.yaml
@@ -4,13 +4,15 @@
defaults: global
description: |
* Reports are published to http://openjdk.linaro.org/SPECjbb2013-1.00-results/
- logrotate:
- numToKeep: 10
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
parameters:
- string:
name: ZERO_BASELINE
@@ -21,11 +23,21 @@
- string:
name: SERVER_CRITICAL_JOPS_BASELINE
default: '854'
+ - string:
+ name: PUBLISH_DEST
+ default: ''
+ - string:
+ name: PUBLISH_HOST
+ default: ''
disabled: false
node: aarch64-06
display-name: 'OpenJDK 9 - Publish SPECjbb2013 benchmark results'
wrappers:
- timestamps
+ - ssh-agent-credentials:
+ # openjdk-testing user id
+ users:
+ - '744cffb4-9ce1-4856-b103-9fdda06dad36'
# Replaced by parameters
# - inject:
# properties-file: '${HOME}/performance-baseline.properties'
@@ -34,8 +46,10 @@
#!/bin/bash
set -exu
+ PERSIST=$HOME/srv/openjdk9
+ export TOP_DIR=$PERSIST
- ~openjdk-testing/specjbb-test-scripts/specjbb-publish /home/openjdk-testing
+ $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
publishers:
- email:
- recipients: 'fathi.boudra@linaro.org'
+ recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-specjbb2013-benchmark.yaml b/jdk9-specjbb2013-benchmark.yaml
index aa5c77947..e5034ad67 100644
--- a/jdk9-specjbb2013-benchmark.yaml
+++ b/jdk9-specjbb2013-benchmark.yaml
@@ -4,13 +4,14 @@
defaults: global
description: |
* Runs the specjbb benchmark in composite mode (i.e., single VM, single node).
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
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 - Run SPECjbb2013 benchmark'
@@ -20,6 +21,7 @@
name: JVM_VARIANT
values:
- server
+# SRDM: Disable client build while waiting for LEG-347 to be fixed.
# - client
- axis:
type: user-defined
diff --git a/jdk9-terasort-benchmark-persist-results.yaml b/jdk9-terasort-benchmark-persist-results.yaml
index 316d8591d..cd81c253a 100644
--- a/jdk9-terasort-benchmark-persist-results.yaml
+++ b/jdk9-terasort-benchmark-persist-results.yaml
@@ -4,12 +4,14 @@
defaults: global
description: |
* Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-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 terasort results'
@@ -19,12 +21,18 @@
name: JVM_VARIANT
values:
- server
- - client
+# SRDM: disable client runs while waiting for LEG-347 to be fixed.
+# - client
- axis:
type: user-defined
name: BUILD_TYPE
values:
- release
+ - axis:
+ type: slave
+ name: label
+ values:
+ - aarch64-06
execution-strategy:
sequential: true
wrappers:
@@ -44,8 +52,25 @@
set -exu
- new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT}/*.csv
- prev_results=~openjdk-testing/hadoop-terasort-benchmark-results/results.csv
+ PERSIST=$HOME/srv/openjdk9
+ export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+ new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv
+ prev_results=$BENCHMARK_RESULTS_DIR/results.csv
+
+ # Ensure persistent directory exists.
+ mkdir -p $BENCHMARK_RESULTS_DIR
+
+ # Tolerate missing results.csv file.
+ if [ ! -f $prev_results ]; then
+ touch $prev_results
+ fi
+
+ 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 +79,4 @@
cat ${new_results} >> ${prev_results}
- ~openjdk-testing/hadoop-test-scripts/update-results-db
+ $SCRIPT_DIR/update-results-db
diff --git a/jdk9-terasort-benchmark-publish-results.yaml b/jdk9-terasort-benchmark-publish-results.yaml
index aa5264587..2f9565f32 100644
--- a/jdk9-terasort-benchmark-publish-results.yaml
+++ b/jdk9-terasort-benchmark-publish-results.yaml
@@ -4,13 +4,15 @@
defaults: global
description: |
* Results are published to http://openjdk.linaro.org/hadoop-terasort-benchmark-results/
- logrotate:
- numToKeep: 10
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
parameters:
- string:
name: ZERO_BASELINE
@@ -21,12 +23,22 @@
- string:
name: SERVER_CRITICAL_JOPS_BASELINE
default: '854'
+ - string:
+ name: PUBLISH_DEST
+ default: ''
+ - string:
+ name: PUBLISH_HOST
+ default: ''
disabled: false
node: aarch64-06
display-name: 'OpenJDK 9 - Publish terasort benchmark results'
wrappers:
- workspace-cleanup:
dirmatch: false
+ - ssh-agent-credentials:
+ # openjdk-testing user id
+ users:
+ - '744cffb4-9ce1-4856-b103-9fdda06dad36'
- timestamps
# Replaced by parameters
# - inject:
@@ -34,8 +46,19 @@
builders:
- shell: |
#!/bin/bash
+ PERSIST=$HOME/srv/openjdk9
+ JDK_VERSION=9
+
+ export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+ 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
- ${HOME}/hadoop-test-scripts/benchmark-terasort-publish /home/openjdk-testing
+ $SCRIPT_DIR/benchmark-terasort-publish $PUBLISH_DEST
publishers:
- email:
- recipients: 'fathi.boudra@linaro.org'
+ recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-terasort-benchmark.yaml b/jdk9-terasort-benchmark.yaml
index 369a49164..6f2cd8ed3 100644
--- a/jdk9-terasort-benchmark.yaml
+++ b/jdk9-terasort-benchmark.yaml
@@ -4,13 +4,14 @@
defaults: global
description: |
* Runs the terasort benchmark.
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
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 - Run terasort benchmark'
@@ -20,6 +21,7 @@
name: JVM_VARIANT
values:
- server
+# SRDM: Disable client builds while waiting for LEG-347 to be fixed.
# - client
- axis:
type: user-defined
diff --git a/jdk9-update-src-tree-persist.yaml b/jdk9-update-src-tree-persist.yaml
index 80a40631e..d25c828f5 100644
--- a/jdk9-update-src-tree-persist.yaml
+++ b/jdk9-update-src-tree-persist.yaml
@@ -3,15 +3,17 @@
project-type: freestyle
defaults: global
description: |
- This jobs writes the current jdk9 src tree to /work/openjdk-testing/openjdk9-jtreg-nightly-tests/...<br>
+ This jobs writes the current jdk9 src tree to /work/openjdk-testing/jdk9/openjdk-jtreg-nightly-tests/...<br>
It is used to report failure/errors against the jtreg results.
- logrotate:
- numToKeep: 10
properties:
- authorization:
anonymous:
- job-read
- job-extended-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 jdk9 source tree'
@@ -32,8 +34,9 @@
: ${YEAR:=$(date +%Y)}
: ${DAY_OF_YEAR:=$(date +%j)}
+ PERSIST=$HOME/srv/openjdk9
- TOP_DIR=$HOME/openjdk9-jtreg-nightly-tests
+ TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests
src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR
mkdir -p $src_dir
echo "Extracting tarball to $src_dir"
diff --git a/jdk9-update-src-tree.yaml b/jdk9-update-src-tree.yaml
index 8e24094bc..afdc50968 100644
--- a/jdk9-update-src-tree.yaml
+++ b/jdk9-update-src-tree.yaml
@@ -64,17 +64,18 @@
Note: this job archives the src which is later required by the jtreg<br>
report and publish job. The build-date.sh artefact contains shell<br>
variables for the day and day-of-year the source was archived.
- logrotate:
- numToKeep: 10
- artifactNumToKeep: 1
properties:
- authorization:
anonymous:
- job-read
- job-extended-read
- linaro:
+ openjdk-members:
- job-build
- job-cancel
+ - build-discarder:
+ days-to-keep: 30
+ num-to-keep: 10
+ artifact-num-to-keep: 5
disabled: false
node: aarch64-06
display-name: 'OpenJDK 9 - Update jdk9 source tree'