From 92edcb7273183a92cc329b2d9d016b41d6d896e1 Mon Sep 17 00:00:00 2001 From: Vratko Polak Date: Wed, 20 Jan 2016 15:35:26 +0100 Subject: [PATCH] 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 --- jjb/aaa/aaa-csit-authn-stable-helium.yaml | 1 + jjb/aaa/aaa-csit-authn.yaml | 3 +++ jjb/aaa/aaa-csit-idmlite.yaml | 3 +++ jjb/alto/alto-csit-setup.yaml | 3 +++ jjb/armoury/armoury-csit-basic.yaml | 2 ++ jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml | 3 +++ jjb/bgpcep/bgpcep-csit-throughpcep.yaml | 3 +++ jjb/bgpcep/bgpcep-csit-userfeatures.yaml | 3 +++ jjb/bgpcep/bgpcep-python.yaml | 2 -- jjb/capwap/capwap-csit-ac.yaml | 3 +++ jjb/centinel/centinel-csit-basic.yaml | 3 +++ .../controller-csit-clustering-lithium.yaml | 1 + jjb/controller/controller-csit-clustering.yaml | 2 ++ .../controller-csit-nsf-stable-helium.yaml | 1 + .../controller-csit-rest-cars-perf.yaml | 3 +++ jjb/didm/didm-csit-discovery.yaml | 3 +++ .../groupbasedpolicy-csit-3node.yaml | 3 +++ .../groupbasedpolicy-csit-6node.yaml | 3 +++ .../groupbasedpolicy-csit-clustering.yaml | 3 +++ .../integration-csit-basic-stable-helium.yaml | 1 + jjb/integration/integration-csit-basic.yaml | 3 +++ .../integration-distribution-jobs.yaml | 4 ++-- jjb/integration/integration-templates.yaml | 17 +++++++++-------- jjb/integration/integration-test-jobs.yaml | 9 ++++++--- jjb/iotdm/iotdm-csit-basic.yaml | 3 +++ .../l2switch-csit-host-scalability-daily.yaml | 3 +++ jjb/l2switch/l2switch-csit-scalability.yaml | 3 +++ .../l2switch-csit-switch-stable-helium.yaml | 1 + jjb/l2switch/l2switch-csit-switch.yaml | 3 +++ jjb/lacp/lacp-csit-lacp.yaml | 3 +++ .../lispflowmapping-csit-all-stable-helium.yaml | 1 + ...lispflowmapping-csit-all-stable-lithium.yaml | 1 + .../lispflowmapping-csit-msmr.yaml | 2 ++ .../lispflowmapping-csit-performance.yaml | 2 ++ ...mdsal-csit-periodic-dsbenchmark-lithium.yaml | 1 + ...aml => mdsal-csit-periodic-dsbenchmark.yaml} | 2 ++ .../messaging4transport-csit-basic.yaml | 2 ++ jjb/nemo/nemo-csit-engine.yaml | 2 ++ jjb/netconf/netconf-clustering.yaml | 2 ++ jjb/netconf/netconf-scale.yaml | 3 +++ jjb/netconf/netconf-userfeatures.yaml | 3 +++ jjb/netide/netide-csit-basic.yaml | 2 ++ jjb/nic/nic-csit-basic.yaml | 3 +++ jjb/nic/nic-csit-vtnrenderer.yaml | 1 + ...it-bulk-matic-ds-daily-lithium-redesign.yaml | 3 +++ ...openflowplugin-csit-bulk-matic-ds-daily.yaml | 3 +++ .../openflowplugin-csit-cbench-daily.yaml | 3 +++ ...sit-cbench-performance-lithium-redesign.yaml | 3 +++ .../openflowplugin-csit-cbench-performance.yaml | 3 +++ .../openflowplugin-csit-clustering.yaml | 3 +++ ...sit-config-performance-lithium-redesign.yaml | 3 +++ .../openflowplugin-csit-config-performance.yaml | 3 +++ ...gin-csit-flow-services-lithium-redesign.yaml | 3 +++ ...enflowplugin-csit-flow-services-lithium.yaml | 1 + ...plugin-csit-flow-services-stable-helium.yaml | 1 + .../openflowplugin-csit-flow-services.yaml | 2 ++ ...link-scalability-daily-lithium-redesign.yaml | 3 +++ ...nflowplugin-csit-link-scalability-daily.yaml | 3 +++ ...wplugin-csit-longevity-lithium-redesign.yaml | 2 ++ .../openflowplugin-csit-longevity.yaml | 2 ++ ...rpc-time-measure-daily-lithium-redesign.yaml | 3 +++ ...nflowplugin-csit-rpc-time-measure-daily.yaml | 3 +++ ...csit-scalability-daily-lithium-redesign.yaml | 3 +++ .../openflowplugin-csit-scalability-daily.yaml | 3 +++ ...lugin-csit-scalability-lithium-redesign.yaml | 3 +++ .../openflowplugin-csit-scalability.yaml | 3 +++ ...stats-collection-daily-lithium-redesign.yaml | 3 +++ ...lugin-csit-scale-stats-collection-daily.yaml | 3 +++ ...-csit-statistics-basic-lithium-redesign.yaml | 2 ++ ...t-sw-scalability-daily-lithium-redesign.yaml | 3 +++ ...penflowplugin-csit-sw-scalability-daily.yaml | 3 +++ jjb/ovsdb/ovsdb-csit-clustering.yaml | 3 +++ jjb/ovsdb/ovsdb-csit-netvirt.yaml | 3 +++ jjb/ovsdb/ovsdb-csit-scalability-daily.yaml | 3 +++ jjb/ovsdb/ovsdb-csit-southbound.yaml | 3 +++ .../packetcable-csit-pcmm-lithium.yaml | 1 + jjb/packetcable/packetcable-csit-pcmm.yaml | 2 ++ jjb/releng-defaults.yaml | 3 +++ .../sdninterfaceapp-csit-basic.yaml | 2 ++ jjb/sfc/sfc-csit-clustering.yaml | 3 +++ jjb/sfc/sfc-python.yaml | 2 -- jjb/snmp/snmp-csit-basic.yaml | 3 +++ jjb/sxp/sxp-csit-basic.yaml | 3 +++ jjb/sxp/sxp-csit-topology.yaml | 3 +++ .../topoprocessing-csit-topology-operation.yaml | 2 ++ jjb/tsdr/tsdr-csit-cassandra.yaml | 3 +++ jjb/tsdr/tsdr-csit-hbase.yaml | 3 +++ jjb/tsdr/tsdr-csit-hsqldb.yaml | 3 +++ jjb/unimgr/unimgr-csit-basic.yaml | 2 ++ jjb/usc/usc-csit-channel.yaml | 3 +++ jjb/usecplugin/usecplugin-csit-basic.yaml | 2 ++ jjb/vpnservice/vpnservice-csit-vpnservice.yaml | 3 +++ jjb/vtn/vtn-csit-coordinator.yaml | 3 +++ jjb/vtn/vtn-csit-manager-stable-helium.yaml | 1 + jjb/vtn/vtn-csit-manager-stable-lithium.yaml | 1 + jjb/vtn/vtn-csit-manager.yaml | 2 ++ 96 files changed, 243 insertions(+), 17 deletions(-) rename jjb/mdsal/{mdsal-csit-periodic-dsbenchmark-beryllium.yaml => mdsal-csit-periodic-dsbenchmark.yaml} (95%) diff --git a/jjb/aaa/aaa-csit-authn-stable-helium.yaml b/jjb/aaa/aaa-csit-authn-stable-helium.yaml index f1fe3275f..5cf3172c8 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 9ef0c6a1a..89d7fc764 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 18f0c0f99..112d84365 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 6e487344a..202f3e473 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 e91d6c105..2f24991e0 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 bf6977798..e81d79757 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 cfbc4180f..7f4edd090 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 37033e5df..09727d51a 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 d4a297574..ae7627367 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 bc56921cf..63e7fd08d 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 b1151e725..7ddc7c73c 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 26d826309..04de420ba 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 9af7c4801..92e987701 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 e967bc7ac..fac4513c9 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 49c1c4a50..7e1dc271d 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 1bdcfcbca..dc4d6b1d8 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 c19515180..da95b78c1 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 f330303b0..4f4f0ce79 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 fc5c48734..1db1ccc18 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 ba2b7410f..7bd9c05e6 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 432747921..266f9a5a2 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 c0914b445..ed1676c7b 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 888586cc3..4426e6b29 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 195876e68..5464d4110 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 73253f7cb..e530ddf8c 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 640d0bc39..d1ddbc7fd 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 b951c8762..ce896a329 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 4b3f58e26..44cc627be 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 56be3d358..24a427082 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 e8f3fe526..19e18dc9a 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 b5b0891ae..deca072b6 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 7ab459a32..c7b63adb7 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 c0ef799b3..d551524a0 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 d6a5e614d..d1e648569 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 61e3b8f6d..62a1b24e3 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 eb5a58aff..4bce66285 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 35b4800ec..ab00be3a6 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 5540d97de..f9c106af0 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 ead3e74a3..fb2e6e3b8 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 314a2e150..b43d41319 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 36b9ee9b0..5a1b56d9f 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 a461eacc5..7fc0dcdeb 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 e98756894..8443e1c8d 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 a437bacd0..4123c4a77 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 5fae0edd8..ccbf77b39 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 e76dacc4c..45b6ad532 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 8b21e0a7f..fa73ce67b 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 ef8109471..0e525eaaa 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 7afd5d186..e5a0393b6 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 289bffdff..509838154 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 d4c8f204e..5322ec2b6 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 8ee3b185a..ae62159e5 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 4bd1b7f64..1c3381a15 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 58a5c711e..2886a540e 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 d712cf48f..513c76f8f 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 d311dc6f6..0e8baca8a 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 5e251b1c0..9fedb2b4b 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 299e599b3..3688f2302 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 beef22f79..32eca642e 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 f2ce6f9d5..074efdeb9 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 73f609130..de8873943 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 f86eca21e..10ffcb19c 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 534af2ac7..82fb0c5be 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 fedd2c30e..74a9d79a0 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 e14a6f731..48afc44a2 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 e98cfbc34..c3fa7821a 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 9598ce0b1..40fa620d1 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 eee00221e..239e8d3de 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 4ca8ded16..6b6a4908a 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 ad95d3698..544a489c1 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 d7aa3a9c7..9ee8ba8bc 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 4b941192c..545dc87b3 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 811c551f0..2ccc23a87 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 ea17f351b..32f8ce502 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 aea82e45d..f10e419c1 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 08faf8512..432986711 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 323078396..f9185b98a 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 8349d067e..4d4861c76 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 d29af4fa4..8823844c9 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 36514ba60..69d0a40a3 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 88ac908f8..50ba94e66 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 41eb2f79f..a54979c58 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 01db60f5b..e616ddd3c 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 b84c79784..a7b5dbfb8 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 92b68fffa..8ec3d3b75 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 81e17c816..6b353588f 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 148ce772f..dcf7e5efb 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 e2f1c0720..432966ae1 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 10e2c19a2..e23f0913f 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 20d50101b..107b570df 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 a16717a2b..d0fb0133d 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 8f80816ef..ffd980747 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 1be13bdda..1b2d27523 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 0691c320e..6e64e6651 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 2f149ee61..ee6b04994 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 c9a5716ef..95b4a9039 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: -- 2.36.6