jdk: Parameterise day of year for jdk9

Change jdk9 builds to use parameterised day of year and year.

Change-Id: I99101f5b022de677933ea15f5d498c9022bfd919

10 files changed, 83 insertions, 1 deletions

diff --git a/jdk9-build-and-test.yaml b/jdk9-build-and-test.yaml
index b39f966637..e09912ba97 100644
--- a/jdk9-build-and-test.yaml
+++ b/jdk9-build-and-test.yaml
@@ -19,6 +19,13 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: master
     display-name: 'OpenJDK 9 - Build jdk images and run tests/benchmarks'
diff --git a/jdk9-jcstress-test-persist-results.yaml b/jdk9-jcstress-test-persist-results.yaml
index 38108fa19d..b98e18ab07 100644
--- a/jdk9-jcstress-test-persist-results.yaml
+++ b/jdk9-jcstress-test-persist-results.yaml
@@ -14,6 +14,13 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: aarch64-06
     display-name: 'OpenJDK 9 - Write jcstress tests results'
diff --git a/jdk9-jtreg-test-persist-results.yaml b/jdk9-jtreg-test-persist-results.yaml
index 46af5aeff0..d5d169271e 100644
--- a/jdk9-jtreg-test-persist-results.yaml
+++ b/jdk9-jtreg-test-persist-results.yaml
@@ -11,10 +11,18 @@
             openjdk-members:
                 - job-build
                 - job-cancel
+                - job-workspace
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: aarch64-06
     display-name: 'OpenJDK 9 - Write jtreg tests results'
@@ -85,16 +93,19 @@
             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},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
 
+            rm -rf  ${image_dir}
             mkdir -p ${image_dir}
 
             tar -C ${basedir} \
               --transform="s/YYY__DAY_OF_YEAR__YYY/$DAY_OF_YEAR/;s/XXX__YEAR__XXX/$YEAR/" \
               --show-transformed-names \
+              --overwrite \
               -xvf ${result_tarball}
 
             tar -C ${image_dir} \
               --strip-components=1 \
               --show-transformed-names \
+              --overwrite \
               -xvf ${image_tarball}
 
             # Change location.
diff --git a/jdk9-jtreg-test-publish-results.yaml b/jdk9-jtreg-test-publish-results.yaml
index fa7fbafe38..d99b05a6fb 100644
--- a/jdk9-jtreg-test-publish-results.yaml
+++ b/jdk9-jtreg-test-publish-results.yaml
@@ -23,6 +23,12 @@
         - string:
             name: PUBLISH_HOST
             default: ''
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: aarch64-06
     display-name: 'OpenJDK 9 - Publish jtreg results'
diff --git a/jdk9-jtreg-test.yaml b/jdk9-jtreg-test.yaml
index f87c565d39..f9e6f7eaf7 100644
--- a/jdk9-jtreg-test.yaml
+++ b/jdk9-jtreg-test.yaml
@@ -15,6 +15,13 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: aarch64-06
     display-name: 'OpenJDK 9 - Run jtreg tests'
diff --git a/jdk9-persist-all-results.yaml b/jdk9-persist-all-results.yaml
index 0fc6645a9a..d3fe3f1a61 100644
--- a/jdk9-persist-all-results.yaml
+++ b/jdk9-persist-all-results.yaml
@@ -13,6 +13,13 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: master
     display-name: 'OpenJDK 9 - Persist all results'
@@ -22,15 +29,20 @@
         - trigger-builds:
             - project: jdk9-jtreg-test-persist-results
               block: true
+              current-parameters: true
         - trigger-builds:
             - project: jdk9-specjbb2013-benchmark-persist-results
               block: true
+              current-parameters: true
         - trigger-builds:
             - project: jdk9-terasort-benchmark-persist-results
               block: true
+              current-parameters: true
         - trigger-builds:
             - project: jdk9-jcstress-test-persist-results
               block: true
+              current-parameters: true
         - trigger-builds:
             - project: jdk9-update-src-tree-persist
               block: true
+              current-parameters: true
diff --git a/jdk9-publish-all-results.yaml b/jdk9-publish-all-results.yaml
index d5220dec3e..05cdeb5826 100644
--- a/jdk9-publish-all-results.yaml
+++ b/jdk9-publish-all-results.yaml
@@ -19,6 +19,19 @@
     disabled: false
     node: master
     display-name: 'OpenJDK 9 - Invoke all the scripts to sync results to openjdk.linaro.org'
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: '/home/openjdk-testing/jdk8u'
+        - string:
+            name: PUBLISH_HOST
+            default: 'stuart.monteith@people.linaro.org'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     wrappers:
         - timestamps
     builders:
diff --git a/jdk9-publish-and-report.yaml b/jdk9-publish-and-report.yaml
index 0a7058fa84..e011f0c19e 100644
--- a/jdk9-publish-and-report.yaml
+++ b/jdk9-publish-and-report.yaml
@@ -11,10 +11,19 @@
             anonymous:
                 - job-read
                 - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
     parameters:
         - string:
             name: DAYS
             default: '15'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: master
     display-name: 'OpenJDK 9 - Publish results and send reports'
diff --git a/jdk9-update-src-tree-persist.yaml b/jdk9-update-src-tree-persist.yaml
index d25c828f5e..65820f4541 100644
--- a/jdk9-update-src-tree-persist.yaml
+++ b/jdk9-update-src-tree-persist.yaml
@@ -14,6 +14,13 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
     disabled: false
     node: aarch64-06
     display-name: 'OpenJDK 9 - Write jdk9 source tree'
diff --git a/jdk9-update-src-tree.yaml b/jdk9-update-src-tree.yaml
index d23c019b18..1ae1b271fc 100644
--- a/jdk9-update-src-tree.yaml
+++ b/jdk9-update-src-tree.yaml
@@ -122,6 +122,9 @@
             : ${YEAR_YESTERDAY:=$YEAR}
             : ${DAY_OF_YEAR_YESTERDAY:=$((10#$DAY_OF_YEAR - 1))}
 
+            echo "YEAR=${YEAR}" >dates.prop
+            echo "DAY_OF_YEAR=${DAY_OF_YEAR}" >>dates.prop
+
             echo "export YEAR=${YEAR}" > out/build-date.sh
             echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh
 
@@ -135,4 +138,4 @@
         - trigger-parameterized-builds:
             - project: jdk9-build-and-test
               condition: SUCCESS
-              trigger-with-no-params: true
+              property-file: dates.prop