diff options
author | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-09 17:39:59 +0000 |
---|---|---|
committer | Stuart Monteith <stuart.monteith@linaro.org> | 2016-11-09 17:52:43 +0000 |
commit | f26496717ec8e6a74f98fd21f7da253522b2978f (patch) | |
tree | fbd24f6190e69e2f771a725ee9e0963de5cf5a90 | |
parent | f3ddf6556459aca91d66f2f18d998a5cc021f1ab (diff) |
jdk: Pass YEAR and DAY_OF_YEAR envars
There is an issue where jobs aren't able to run across different days,
and can't be restarted across different days.
This change causes jdk8-update-src-tree.yaml to generate the YEAR and
DAY_OF_YEAR envars, which it puts into a property file the job
subsequenetly uses as parameters to launch the other jobs.
Change-Id: I70ef3cf00deb0c248d99ad20ba8bb7a49b1bc032
-rw-r--r-- | jdk8-build-and-test.yaml | 7 | ||||
-rw-r--r-- | jdk8-jcstress-test-persist-results.yaml | 7 | ||||
-rw-r--r-- | jdk8-jtreg-test-persist-results.yaml | 7 | ||||
-rw-r--r-- | jdk8-jtreg-test-publish-results.yaml | 6 | ||||
-rw-r--r-- | jdk8-persist-all-results.yaml | 7 | ||||
-rw-r--r-- | jdk8-publish-all-results.yaml | 6 | ||||
-rw-r--r-- | jdk8-publish-and-report.yaml | 6 | ||||
-rw-r--r-- | jdk8-update-src-tree-persist.yaml | 7 | ||||
-rw-r--r-- | jdk8-update-src-tree.yaml | 5 |
9 files changed, 57 insertions, 1 deletions
diff --git a/jdk8-build-and-test.yaml b/jdk8-build-and-test.yaml index 26d34df99a..6f4015701c 100644 --- a/jdk8-build-and-test.yaml +++ b/jdk8-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 8 - Build jdk images and run tests/benchmarks' diff --git a/jdk8-jcstress-test-persist-results.yaml b/jdk8-jcstress-test-persist-results.yaml index 7f6abaf15a..077ab912ef 100644 --- a/jdk8-jcstress-test-persist-results.yaml +++ b/jdk8-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 8 - Write jcstress tests results' diff --git a/jdk8-jtreg-test-persist-results.yaml b/jdk8-jtreg-test-persist-results.yaml index a8f446c272..1ddb646172 100644 --- a/jdk8-jtreg-test-persist-results.yaml +++ b/jdk8-jtreg-test-persist-results.yaml @@ -16,6 +16,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 8 - Write jtreg tests results' diff --git a/jdk8-jtreg-test-publish-results.yaml b/jdk8-jtreg-test-publish-results.yaml index 0af4200cfe..70ce46e82a 100644 --- a/jdk8-jtreg-test-publish-results.yaml +++ b/jdk8-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 8 - Publish jtreg results' diff --git a/jdk8-persist-all-results.yaml b/jdk8-persist-all-results.yaml index fed2a9944c..e14bba25ce 100644 --- a/jdk8-persist-all-results.yaml +++ b/jdk8-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 8 - Persist all results' diff --git a/jdk8-publish-all-results.yaml b/jdk8-publish-all-results.yaml index 040a5668b5..1be2341fcc 100644 --- a/jdk8-publish-all-results.yaml +++ b/jdk8-publish-all-results.yaml @@ -26,6 +26,12 @@ - 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/jdk8-publish-and-report.yaml b/jdk8-publish-and-report.yaml index 220c8f0ca2..5fded62e1e 100644 --- a/jdk8-publish-and-report.yaml +++ b/jdk8-publish-and-report.yaml @@ -18,6 +18,12 @@ - string: name: DAYS default: '15' + - string: + name: YEAR + default: 'default' + - string: + name: DAY_OF_YEAR + default: 'default' disabled: false node: master display-name: 'OpenJDK 8 - Publish results and send reports' diff --git a/jdk8-update-src-tree-persist.yaml b/jdk8-update-src-tree-persist.yaml index 81768622ad..d32b4e1295 100644 --- a/jdk8-update-src-tree-persist.yaml +++ b/jdk8-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 8 - Write jdk8 source tree' diff --git a/jdk8-update-src-tree.yaml b/jdk8-update-src-tree.yaml index e6ba75f04a..97db7bda42 100644 --- a/jdk8-update-src-tree.yaml +++ b/jdk8-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: jdk8-build-and-test condition: SUCCESS - trigger-with-no-params: true + property-file: dates.prop |