From: Vratko Polak Date: Wed, 20 Jan 2016 14:35:26 +0000 (+0100) Subject: Make Java version for CSIT jobs configurable X-Git-Tag: release/beryllium~56^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F01%2F33101%2F5;p=releng%2Fbuilder.git Make Java version for CSIT jobs configurable + Every csit job uses openjdk7, except boron which uses openjdk8. + Removed jdk field from verify-python jobs. + Dropped -beryllium from the mdsal-dsbenchmark job definition file name. + Made jenkins parameter to pass down to indivdual CSIT jobs from test-integration. Change-Id: Iaab9020b7235a82cd1674b1d7af8f2f4ac9a4b8b Signed-off-by: Vratko Polak --- diff --git a/jjb/aaa/aaa-csit-authn-stable-helium.yaml b/jjb/aaa/aaa-csit-authn-stable-helium.yaml index f1fe3275fc..5cf3172c8f 100644 --- a/jjb/aaa/aaa-csit-authn-stable-helium.yaml +++ b/jjb/aaa/aaa-csit-authn-stable-helium.yaml @@ -14,6 +14,7 @@ stream: - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 9ef0c6a1af..89d7fc7644 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/aaa/aaa-csit-idmlite.yaml b/jjb/aaa/aaa-csit-idmlite.yaml index 18f0c0f99f..112d84365e 100644 --- a/jjb/aaa/aaa-csit-idmlite.yaml +++ b/jjb/aaa/aaa-csit-idmlite.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 6e487344a4..202f3e4735 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/armoury/armoury-csit-basic.yaml b/jjb/armoury/armoury-csit-basic.yaml index e91d6c105c..2f24991e07 100644 --- a/jjb/armoury/armoury-csit-basic.yaml +++ b/jjb/armoury/armoury-csit-basic.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index bf69777980..e81d797573 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index cfbc4180fd..7f4edd0907 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index 37033e5df9..09727d51ac 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/bgpcep/bgpcep-python.yaml b/jjb/bgpcep/bgpcep-python.yaml index d4a2975749..ae76273670 100644 --- a/jjb/bgpcep/bgpcep-python.yaml +++ b/jjb/bgpcep/bgpcep-python.yaml @@ -14,7 +14,6 @@ branch: 'stable/lithium' project: 'bgpcep' - jdk: 'openjdk7' - job-template: name: 'bgpcep-verify-python-{stream}' @@ -30,7 +29,6 @@ project-type: freestyle node: dynamic_verify concurrent: true - jdk: '{jdk}' logrotate: daysToKeep: '{build-days-to-keep}' diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index bc56921cfe..63e7fd08dd 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index b1151e7258..7ddc7c73cb 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/controller/controller-csit-clustering-lithium.yaml b/jjb/controller/controller-csit-clustering-lithium.yaml index 26d8263091..04de420ba8 100644 --- a/jjb/controller/controller-csit-clustering-lithium.yaml +++ b/jjb/controller/controller-csit-clustering-lithium.yaml @@ -13,6 +13,7 @@ stream: - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 9af7c48017..92e9877016 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/controller/controller-csit-nsf-stable-helium.yaml b/jjb/controller/controller-csit-nsf-stable-helium.yaml index e967bc7ac9..fac4513c9a 100644 --- a/jjb/controller/controller-csit-nsf-stable-helium.yaml +++ b/jjb/controller/controller-csit-nsf-stable-helium.yaml @@ -14,6 +14,7 @@ stream: - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 49c1c4a500..7e1dc271de 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index 1bdcfcbca7..dc4d6b1d80 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index c195151809..da95b78c12 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index f330303b02..4f4f0ce793 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index fc5c487348..1db1ccc183 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/integration/integration-csit-basic-stable-helium.yaml b/jjb/integration/integration-csit-basic-stable-helium.yaml index ba2b7410f1..7bd9c05e6f 100644 --- a/jjb/integration/integration-csit-basic-stable-helium.yaml +++ b/jjb/integration/integration-csit-basic-stable-helium.yaml @@ -15,6 +15,7 @@ stream: - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/integration/integration-csit-basic.yaml b/jjb/integration/integration-csit-basic.yaml index 432747921a..266f9a5a2b 100644 --- a/jjb/integration/integration-csit-basic.yaml +++ b/jjb/integration/integration-csit-basic.yaml @@ -16,10 +16,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/integration/integration-distribution-jobs.yaml b/jjb/integration/integration-distribution-jobs.yaml index c0914b445a..ed1676c7b5 100644 --- a/jjb/integration/integration-distribution-jobs.yaml +++ b/jjb/integration/integration-distribution-jobs.yaml @@ -166,7 +166,7 @@ - integration-bundleurl: bundleurl: 'last' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' wrappers: - build-timeout @@ -215,7 +215,7 @@ - integration-bundleurl: bundleurl: 'last' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' wrappers: - build-timeout diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 888586cc3f..4426e6b290 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -56,7 +56,7 @@ - integration-test-plan: test-plan: '{project}-{functionality}.txt' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -136,7 +136,7 @@ - integration-patch-refspec: branch: 'stable/helium' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -242,7 +242,8 @@ - integration-test-plan: test-plan: '{project}-{functionality}.txt' - integration-jdk-version: - jdkversion: 'openjdk7' + # Here {jdk} is taken from releng-defaults.yaml + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -322,7 +323,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -425,7 +426,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -524,7 +525,7 @@ - integration-test-plan: test-plan: '{project}-{functionality}.txt' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -606,7 +607,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -711,7 +712,7 @@ - integration-patch-refspec: branch: 'master' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' scm: - integration-gerrit-scm: diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml index 195876e682..5464d41107 100644 --- a/jjb/integration/integration-test-jobs.yaml +++ b/jjb/integration/integration-test-jobs.yaml @@ -11,7 +11,7 @@ stream: - boron: branch: 'master' - jdk: 'openjdk7' + jdk: 'openjdk8' csit-list: > aaa-csit-1node-authn-only-{stream}, aaa-csit-1node-authn-all-{stream}, @@ -268,7 +268,8 @@ - integration-patch-refspec: branch: '$GERRIT_REFSPEC' - integration-jdk-version: - jdkversion: 'openjdk7' + # {jdk} is from releng-defaults + jdkversion: '{jdk}' scm: - integration-gerrit-scm: @@ -337,7 +338,7 @@ - integration-bundleurl: bundleurl: 'last' - integration-jdk-version: - jdkversion: 'openjdk7' + jdkversion: '{jdk}' triggers: - timed: 'H H * * 6' @@ -349,6 +350,8 @@ predefined-parameters: BUNDLEURL=$BUNDLEURL + JDKVERSION=$JDKVERSION + publishers: - email-notification: email-prefix: '[integration]' diff --git a/jjb/iotdm/iotdm-csit-basic.yaml b/jjb/iotdm/iotdm-csit-basic.yaml index 73253f7cb5..e530ddf8c7 100644 --- a/jjb/iotdm/iotdm-csit-basic.yaml +++ b/jjb/iotdm/iotdm-csit-basic.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml index 640d0bc39a..d1ddbc7fd9 100644 --- a/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml +++ b/jjb/l2switch/l2switch-csit-host-scalability-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/l2switch/l2switch-csit-scalability.yaml b/jjb/l2switch/l2switch-csit-scalability.yaml index b951c8762b..ce896a3291 100644 --- a/jjb/l2switch/l2switch-csit-scalability.yaml +++ b/jjb/l2switch/l2switch-csit-scalability.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml index 4b3f58e263..44cc627be5 100644 --- a/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml +++ b/jjb/l2switch/l2switch-csit-switch-stable-helium.yaml @@ -14,6 +14,7 @@ stream: - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/l2switch/l2switch-csit-switch.yaml b/jjb/l2switch/l2switch-csit-switch.yaml index 56be3d3581..24a427082b 100644 --- a/jjb/l2switch/l2switch-csit-switch.yaml +++ b/jjb/l2switch/l2switch-csit-switch.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index e8f3fe526e..19e18dc9a2 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml index b5b0891aee..deca072b6b 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml @@ -14,6 +14,7 @@ stream: - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml index 7ab459a32e..c7b63adb76 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml @@ -13,6 +13,7 @@ stream: - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index c0ef799b30..d551524a02 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index d6a5e614da..d1e6485699 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -13,8 +13,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml index 61e3b8f6d1..62a1b24e31 100644 --- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml +++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml @@ -13,6 +13,7 @@ stream: - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml similarity index 95% rename from jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml rename to jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml index eb5a58aff3..4bce66285f 100644 --- a/jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml +++ b/jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml @@ -13,8 +13,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index 35b4800ec0..ab00be3a68 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 5540d97de0..f9c106af09 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index ead3e74a35..fb2e6e3b80 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -13,8 +13,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 314a2e150a..b43d413194 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 36b9ee9b00..5a1b56d9fe 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index a461eacc5d..7fc0dcdeb6 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml index e987568944..8443e1c8dd 100644 --- a/jjb/nic/nic-csit-basic.yaml +++ b/jjb/nic/nic-csit-basic.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml index a437bacd0a..4123c4a773 100644 --- a/jjb/nic/nic-csit-vtnrenderer.yaml +++ b/jjb/nic/nic-csit-vtnrenderer.yaml @@ -14,6 +14,7 @@ stream: - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml index 5fae0edd86..ccbf77b397 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml index e76dacc4cc..45b6ad532b 100644 --- a/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml index 8b21e0a7fc..fa73ce67ba 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml index ef81094711..0e525eaaaa 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml index 7afd5d1867..e5a0393b60 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index 289bffdffe..5098381548 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml index d4c8f204e1..5322ec2b64 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml index 8ee3b185ad..ae62159e5c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-config-performance.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml index 4bd1b7f64f..1c3381a156 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml index 58a5c711e8..2886a540ea 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml @@ -13,6 +13,7 @@ stream: - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml index d712cf48f2..513c76f8f9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml @@ -14,6 +14,7 @@ stream: - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index d311dc6f6d..0e8baca8af 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml index 5e251b1c03..9fedb2b4b4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml index 299e599b37..3688f2302e 100644 --- a/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml index beef22f794..32eca642ef 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml @@ -13,8 +13,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index f2ce6f9d50..074efdeb92 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -13,8 +13,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml index 73f609130a..de88739438 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml index f86eca21ef..10ffcb19cf 100644 --- a/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml index 534af2ac7e..82fb0c5be9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml index fedd2c30e3..74a9d79a0f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml index e14a6f7319..48afc44a27 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml index e98cfbc348..c3fa7821af 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scalability.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scalability.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml index 9598ce0b1f..40fa620d11 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml index eee00221e0..239e8d3de3 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml index 4ca8ded163..6b6a4908a4 100644 --- a/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml @@ -13,8 +13,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml index ad95d3698a..544a489c1c 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml index d7aa3a9c76..9ee8ba8bc0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index 4b941192c0..545dc87b36 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-netvirt.yaml b/jjb/ovsdb/ovsdb-csit-netvirt.yaml index 811c551f0c..2ccc23a874 100644 --- a/jjb/ovsdb/ovsdb-csit-netvirt.yaml +++ b/jjb/ovsdb/ovsdb-csit-netvirt.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml index ea17f351bf..32f8ce502c 100644 --- a/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml +++ b/jjb/ovsdb/ovsdb-csit-scalability-daily.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index aea82e45d4..f10e419c15 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml index 08faf85123..432986711b 100644 --- a/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm-lithium.yaml @@ -13,6 +13,7 @@ stream: - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 3230783969..f9185b98a1 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index 8349d067e5..4d4861c765 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -101,3 +101,6 @@ mininet-image: 'rk-c-el6-mininet' mininet-vms: 1 mininet-cloud-name: 'Rackspace DFW - Integration Dynamic Lab' + + # In case a CSIT job is merged without Java version specified + jdk: 'openjdk8' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index d29af4fa47..8823844c91 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/sfc/sfc-csit-clustering.yaml b/jjb/sfc/sfc-csit-clustering.yaml index 36514ba602..69d0a40a37 100644 --- a/jjb/sfc/sfc-csit-clustering.yaml +++ b/jjb/sfc/sfc-csit-clustering.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 88ac908f8c..50ba94e667 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -12,7 +12,6 @@ branch: 'stable/beryllium' project: 'sfc' - jdk: 'openjdk7' - job-template: name: 'sfc-verify-python-{stream}' @@ -28,7 +27,6 @@ project-type: freestyle node: dynamic_verify concurrent: true - jdk: '{jdk}' logrotate: daysToKeep: '{build-days-to-keep}' diff --git a/jjb/snmp/snmp-csit-basic.yaml b/jjb/snmp/snmp-csit-basic.yaml index 41eb2f79fb..a54979c588 100644 --- a/jjb/snmp/snmp-csit-basic.yaml +++ b/jjb/snmp/snmp-csit-basic.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 01db60f5b5..e616ddd3c6 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index b84c79784c..a7b5dbfb8f 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -13,10 +13,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml index 92b68fffac..8ec3d3b75b 100644 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 81e17c8166..6b353588f0 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index 148ce772f0..dcf7e5efbb 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index e2f1c0720e..432966ae11 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml index 10e2c19a26..e23f0913fa 100644 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ b/jjb/unimgr/unimgr-csit-basic.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 20d50101be..107b570df2 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index a16717a2b7..d0fb0133d3 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml index 8f80816ef1..ffd980747a 100644 --- a/jjb/vpnservice/vpnservice-csit-vpnservice.yaml +++ b/jjb/vpnservice/vpnservice-csit-vpnservice.yaml @@ -14,10 +14,13 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/vtn/vtn-csit-coordinator.yaml b/jjb/vtn/vtn-csit-coordinator.yaml index 1be13bdda9..1b2d27523c 100644 --- a/jjb/vtn/vtn-csit-coordinator.yaml +++ b/jjb/vtn/vtn-csit-coordinator.yaml @@ -14,10 +14,13 @@ stream: # - boron: # branch: 'master' +# jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/vtn/vtn-csit-manager-stable-helium.yaml b/jjb/vtn/vtn-csit-manager-stable-helium.yaml index 0691c320e4..6e64e6651e 100644 --- a/jjb/vtn/vtn-csit-manager-stable-helium.yaml +++ b/jjb/vtn/vtn-csit-manager-stable-helium.yaml @@ -14,6 +14,7 @@ stream: - stable-helium: branch: 'stable/helium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml index 2f149ee613..ee6b049949 100644 --- a/jjb/vtn/vtn-csit-manager-stable-lithium.yaml +++ b/jjb/vtn/vtn-csit-manager-stable-lithium.yaml @@ -14,6 +14,7 @@ stream: - stable-lithium: branch: 'stable/lithium' + jdk: 'openjdk7' install: - only: diff --git a/jjb/vtn/vtn-csit-manager.yaml b/jjb/vtn/vtn-csit-manager.yaml index c9a5716ef4..95b4a9039e 100644 --- a/jjb/vtn/vtn-csit-manager.yaml +++ b/jjb/vtn/vtn-csit-manager.yaml @@ -14,8 +14,10 @@ stream: - boron: branch: 'master' + jdk: 'openjdk8' - beryllium: branch: 'stable/beryllium' + jdk: 'openjdk7' install: - only: