Merge "Add BUNDLE_URL Robot variable definition"
authorVratko Polák <vrpolak@cisco.com>
Fri, 5 Feb 2016 13:22:42 +0000 (13:22 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 5 Feb 2016 13:22:42 +0000 (13:22 +0000)
160 files changed:
jjb-templates/merge.yaml
jjb-templates/periodic.yaml
jjb/aaa/aaa-csit-authn-stable-helium.yaml
jjb/aaa/aaa-csit-authn.yaml
jjb/aaa/aaa-csit-idmlite.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto-csit-setup.yaml
jjb/alto/alto.yaml
jjb/armoury/armoury-csit-basic.yaml
jjb/armoury/armoury.yaml
jjb/autorelease/include-raw-autorelease-get-integration-test-variables.sh
jjb/autorelease/include-raw-autorelease-maven-deploy.sh
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-userfeatures.yaml
jjb/bgpcep/bgpcep-python.yaml
jjb/bgpcep/bgpcep.yaml
jjb/capwap/capwap-csit-ac.yaml
jjb/capwap/capwap.yaml
jjb/centinel/centinel-csit-basic.yaml
jjb/centinel/centinel.cfg
jjb/centinel/centinel.yaml
jjb/controller/controller-csit-clustering-lithium.yaml
jjb/controller/controller-csit-clustering.yaml
jjb/controller/controller-csit-nsf-stable-helium.yaml
jjb/controller/controller-csit-rest-cars-perf.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/defense4all/defense4all.yaml
jjb/didm/didm-csit-discovery.yaml
jjb/didm/didm.yaml
jjb/discovery/discovery.yaml
jjb/dlux/dlux.yaml
jjb/docs/docs.yaml
jjb/faas/faas.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/integration/include-raw-integration-deploy-controller-verify.sh
jjb/integration/integration-csit-basic-stable-helium.yaml
jjb/integration/integration-csit-basic.yaml
jjb/integration/integration-distribution-jobs.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/iotdm/iotdm-csit-basic.yaml
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-csit-scalability.yaml
jjb/l2switch/l2switch-csit-switch-stable-helium.yaml
jjb/l2switch/l2switch-csit-switch.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp-csit-lacp.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping-csit-all-stable-helium.yaml
jjb/lispflowmapping/lispflowmapping-csit-all-stable-lithium.yaml
jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-periodic-dsbenchmark-lithium.yaml
jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml [moved from jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml with 95% similarity]
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport-csit-basic.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/nemo/nemo-csit-engine.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf-userfeatures.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide-csit-basic.yaml
jjb/netide/netide.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic-csit-basic.yaml
jjb/nic/nic-csit-vtnrenderer.yaml
jjb/nic/nic.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-bulk-matic-ds-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-daily.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-performance-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-cbench-performance.yaml
jjb/openflowplugin/openflowplugin-csit-clustering.yaml
jjb/openflowplugin/openflowplugin-csit-config-performance-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-config-performance.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-lithium.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services-stable-helium.yaml
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-link-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-longevity-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-longevity.yaml
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-rpc-time-measure-daily.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-daily.yaml
jjb/openflowplugin/openflowplugin-csit-scalability-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-scalability.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-scale-stats-collection-daily.yaml
jjb/openflowplugin/openflowplugin-csit-statistics-basic-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily-lithium-redesign.yaml
jjb/openflowplugin/openflowplugin-csit-sw-scalability-daily.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovsdb/ovsdb-csit-clustering.yaml
jjb/ovsdb/ovsdb-csit-netvirt.yaml
jjb/ovsdb/ovsdb-csit-scalability-daily.yaml
jjb/ovsdb/ovsdb-csit-southbound.yaml
jjb/ovsdb/ovsdb.yaml
jjb/packetcable/packetcable-csit-pcmm-lithium.yaml
jjb/packetcable/packetcable-csit-pcmm.yaml
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc-csit-clustering.yaml
jjb/sfc/sfc-python.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp-csit-basic.yaml
jjb/snmp/snmp.cfg
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.cfg
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/tcpmd5/tcpmd5.yaml
jjb/toolkit/toolkit.yaml
jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr-csit-cassandra.yaml
jjb/tsdr/tsdr-csit-hbase.yaml
jjb/tsdr/tsdr-csit-hsqldb.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr-csit-basic.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin-csit-basic.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vpnservice/vpnservice-csit-vpnservice.yaml
jjb/vpnservice/vpnservice.yaml
jjb/vtn/vtn-csit-coordinator.yaml
jjb/vtn/vtn-csit-manager-stable-helium.yaml
jjb/vtn/vtn-csit-manager-stable-lithium.yaml
jjb/vtn/vtn-csit-manager.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangtools/yangtools-verify.yaml
jjb/yangtools/yangtools.yaml

index c416ea8664659ae0016633c5cf2678e376c3c1fd..d9ee40ff8c10f4cd5acaa5cc560ff3bf308f067b 100644 (file)
@@ -15,8 +15,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 8329946ade435de177f3001abdc91117967eb707..7e55fbee7ed564f7c9f524d18f6bea6b23a6bb00 100644 (file)
@@ -16,8 +16,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index f1fe3275fc8289e2873292275b191dc2d55c11f9..5cf3172c8f7ac6f4aee49c2a1caf9456248c81a1 100644 (file)
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 9ef0c6a1af847f4f14bc1aa9cee368a0e288f00b..89d7fc764467162fc538f2c088d8e738021feb2e 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 18f0c0f99f619f163271fa200e6746bf665d3050..112d84365e43d9e5f3f98aca21862c768423b9b9 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 5b2aa95a799c0da08ea0b570f68836247837192a..420fb775655e8d39072a760980ae1952ddc23cbf 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 6e487344a406823709c86eed58ba4605070e30c0..202f3e4735480f8abb9518e85cabaa41ec819598 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 3f420e4e726227ffc1468e40da9db647676040dd..f85ec3c0bc355a37e01969b7c5c0b508fb6db696 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index e91d6c105c50399c43ca8ee171c75398b2ca6dc7..2f24991e076c778c70a1f8a67db5e86867783f12 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index b0a578f71b6af19d31a92c8f0feebc188b44d4bf..388f205b80ccb75ee1b711644ae9b1d256ca63c7 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index a4b6deb6c8836aa4c183c7860a6a4a706133452a..ff7cf11a3f5b7efc4e9691f8187cbd8ed430279e 100644 (file)
@@ -1,7 +1,7 @@
 #!/bin/bash
 # @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
 ##############################################################################
-# Copyright (c) 2015 The Linux Foundation and others.
+# Copyright (c) 2015, 2016 The Linux Foundation and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
@@ -9,8 +9,8 @@
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
 
-NEXUSURL=http://nexus.opendaylight.org/content/repositories/
+NEXUSURL=https://nexus.opendaylight.org/staged-repos/
 VERSION=`grep -m1 '<version>' ${WORKSPACE}/integration/distribution/distribution-karaf/pom.xml | awk -F'[<|>]' '/version/ { printf $3 }'`
-REPOID=`grep "Closing staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
+REPOID=`grep "Created staging repository with ID" $WORKSPACE/deploy-staged-repository.log | cut -d '"' -f2`
 
 echo BUNDLEURL=${NEXUSURL}/${REPOID}/org/opendaylight/integration/distribution-karaf/${VERSION}/distribution-karaf-${VERSION}.zip > $WORKSPACE/variables.prop
index f9acf7c532da1a55ec69aac7c11ed95d16daf587..8bf44222416baeb9048907f0aadb2d861a23e910 100644 (file)
@@ -25,8 +25,7 @@ mkdir -p m2repo/org/opendaylight/
 (IFS='
 '
 for m in `xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' ../../../../pom.xml`; do
-    rsync -avz --exclude 'maven-metadata-local.xml' \
-               --exclude 'maven-metadata-*' \
+    rsync -avz --exclude 'maven-metadata*' \
                --exclude '_remote.repositories' \
                --exclude 'resolver-status.properties' \
                "/tmp/r/org/opendaylight/$m" m2repo/org/opendaylight/
@@ -34,8 +33,7 @@ done)
 
 # Add exception for integration project since they release under the
 # integration top-level project.
-rsync -avz --exclude 'maven-metadata-local.xml' \
-           --exclude 'maven-metadata-*' \
+rsync -avz --exclude 'maven-metadata*' \
            --exclude '_remote.repositories' \
            --exclude 'resolver-status.properties' \
            "/tmp/r/org/opendaylight/integration" m2repo/org/opendaylight/
index bf69777980e7e3b32ddc393618a68a4f5ab02224..e81d7975738d115c986ff65f47b51d41b8770a7b 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index cfbc4180fd3c9c55e445fae656acbc7974550191..49dde52e7984ba7827868adfdcb91c43eb5befc3 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -31,7 +34,7 @@
     # The other options are workarounds for Sandbox not being as performant
     # as the private lab where this suite was developed.
     # Robot custom options:
-    robot-options: '-v PCEP_READY_VERIFY_TIMEOUT:5 -v RESTCONF_REUSE:False -v UPDATER_TIMEOUT:360'
+    robot-options: '-v PCEP_READY_VERIFY_TIMEOUT:5 -v RESTCONF_REUSE:False -v UPDATER_TIMEOUT:600'
 
     # This performance test can take up to one hour to finish,
     # so the job is defined to run once a day.
index 37033e5df96c022113324c19515eaa4667849443..09727d51ace61d25f3ea88e684b7ad9b5a277666 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index d4a2975749e20a84e2b6c2c4ee6224defabf7ce8..ae7627367019a64b19b565e85e03656a43eb13c7 100644 (file)
@@ -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}'
index 29e06eb9c04a8656f5bab6232323273abeed426b..430fefb44638c44a5c0ccf76d8c1f95666d53953 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index bc56921cfe5ee6ce8e39ab2a606138943e1c876d..63e7fd08ddadfb24761a5fd7493d93831feb735e 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 701eb35c5e34730703c97b91114f5be2b3cf0ad6..f07bf983038c9e1903ba8146a35bf87dca9cd9c7 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index b1151e72581c325d891c47bc4863cb2ea4172936..7ddc7c73cb527e7be9eaf510c536f99c33b56a40 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 0708008fe4cfae32a5a3f3d8e6dafb9d5623dea3..ef67d88dad30e2a50b854374360262d50f8f91d8 100644 (file)
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium
index 558e55da65f3b766670df17f8a4c28e2f6a25b8e..59b40fd3e88d44efb8134a91e56fed3ccb717fc5 100644 (file)
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 26d8263091081ee5762299f437d04193d78524b9..8b9dabcf391aebcfba1e3e0531d3a65518dd0314 100644 (file)
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -20,7 +21,7 @@
         # Bug 4676 means -all- would fail.
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
 
     # Robot custom options
     robot-options: ''
index 9af7c48017f390ab2c054edbb644b10889b79131..68fc79d3732fd18ee58a017a00a303e2a6e67d63 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -24,7 +26,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-clustering-test-app,odl-netconf-connector-ssh'
+    install-features: 'odl-restconf,odl-clustering-test-app,odl-jolokia'
 
     # Robot custom options
     robot-options: ''
index e967bc7ac99b429c1bd6240d8e2ed61109814ee0..fac4513c9aceb7a69df893116b47a608367dbc89 100644 (file)
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 49c1c4a500e8ab98590482b8e3285d3a4aec3caa..7e1dc271de0851a65e3fbb564af61e71c76eb566 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index b32d2fbdc69a1032c7ce2c0fd19cf1c179d54594..d453981c8d1f597d0d5808280e001ae0c3f0ae21 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 8bb8868376c16b17acc2e9cf90efe575b5e4d2e4..d5ee79851865bd2ca230c4575b9dcac25e17e293 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 18670b93df110cc920ff409c0091e1e9f2a32aa4..3ee805a124e984a3e58b4541031fa1f2967e5ca4 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 1bdcfcbca7e98298f231f188239e978d103b49d5..dc4d6b1d809a967784115f1793bd1a4330b2f5f8 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 791f9ea707dedabe72d93933bce12ebba1ea9a9f..7bc907554d8b474a6f10297836779fcf602bdbdb 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index d24d982cd8041e66533b96e2a612a6d9d8078500..7189780d4e07d736341ff12122142c3190eb20ae 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index ca06a233ea335843ff5f6775fb15d73097928f15..a7303b29dc3fda1c7f7aa4d869861d0d011257c8 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 8f997ad0b376e5ad1a95ac08f45c4d4d7a6cb06f..ef2c69b6d2ccd99688d2f605982bb1742bc81c27 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 3b8bfaea5c574a99c30ae86fa025eee30cf21278..21fcfef9a005f3e8c54ec3990acc4c0222fbe26d 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index c195151809d766276c7c50f851ed0266439a1e5d..da95b78c1281c6f9eeca1caeac4314cf7caa4dc8 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index f330303b028f5e07e071a3c1937845b6bcc74a36..4f4f0ce79371590286aab9c670948796aa0bfd73 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index fc5c487348fbefdf5a373b3a47739bed090b34cb..1db1ccc183cf9c53fff1d18690ee42761035e1f6 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index df0b54da00991ec8f3f787276190e868021cbceb..7fe38646a7ec82780dd8c2e0edf81b1179ab77ae 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index d7b57d004a749e3df0ff05d06a913ccb23079bf7..2066e3e2b942049f5b8bdc129b8784997273077e 100644 (file)
@@ -108,5 +108,16 @@ cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
 echo "Kill controller"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
-# vim: ts=4 sw=4 sts=4 et ft=sh :
+echo "Detecting misplaced config files"
+pushd "${WORKSPACE}/${BUNDLEFOLDER}"
+XMLS_FOUND=`echo *.xml`
+popd
+if [ "$XMLS_FOUND" != "*.xml" ]; then
+    echo "Bug 4628 confirmed."
+    ## TODO: Uncomment the following when ODL is fixed, to guard against regression.
+    # exit 1
+else
+    echo "Bug 4628 not detected."
+fi
 
+# vim: ts=4 sw=4 sts=4 et ft=sh :
index ba2b7410f16dba37db1aeaa7568c27b796983d41..7bd9c05e6fbb36a04cfbaeb7e8400fa4d967ac94 100644 (file)
@@ -15,6 +15,7 @@
     stream:
        - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 432747921af24d23ef6ffa49c8d7e82547034176..266f9a5a2b04414a036bb886d0691850550394a2 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index c0914b445a39baa8939ae904094a4090b6c0825a..ed1676c7b5bbbf6af56b02accfb0a1f9096802bf 100644 (file)
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     wrappers:
         - build-timeout
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     wrappers:
         - build-timeout
index 888586cc3f8115dca637906561d585d94a08c68e..4426e6b290a010111ec728bfb608a535aee807a6 100644 (file)
@@ -56,7 +56,7 @@
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
         - integration-patch-refspec:
             branch: 'stable/helium'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
         - 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:
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
         - integration-test-plan:
             test-plan: '{project}-{functionality}.txt'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
         - integration-patch-refspec:
             branch: 'master'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
index a572832523f36bc945c5cffbc591d2fb8a0a70b8..5464d411073671d7790f5215f5832348cd576b59 100644 (file)
@@ -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},
                 snmp-csit-1node-basic-all-{stream},
                 topoprocessing-csit-1node-topology-operations-all-{stream},
                 topoprocessing-csit-1node-topology-operations-only-{stream},
-                tsdr-csit-1node-h2-datastore-only-{stream},
-                tsdr-csit-1node-h2-datastore-all-{stream},
                 tsdr-csit-1node-hbase-datastore-only-{stream},
                 tsdr-csit-1node-hbase-datastore-all-{stream},
                 usc-csit-1node-channel-only-{stream},
                 usc-csit-1node-channel-all-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
                 vpnservice-csit-1node-vpnservice-all-{stream},
-                vtn-csit-1node-manager-only-{stream},
-                vtn-csit-1node-manager-all-{stream}
+                vtn-csit-1node-manager-only-{stream}
 
         - beryllium:
             branch: 'stable/beryllium'
                 snmp-csit-1node-basic-all-{stream},
                 topoprocessing-csit-1node-topology-operations-all-{stream},
                 topoprocessing-csit-1node-topology-operations-only-{stream},
-                tsdr-csit-1node-h2-datastore-only-{stream},
-                tsdr-csit-1node-h2-datastore-all-{stream},
                 tsdr-csit-1node-hbase-datastore-only-{stream},
                 tsdr-csit-1node-hbase-datastore-all-{stream},
                 usc-csit-1node-channel-only-{stream},
                 vpnservice-csit-1node-vpnservice-only-{stream},
                 vpnservice-csit-1node-vpnservice-all-{stream},
                 vtn-csit-1node-manager-only-{stream},
-                vtn-csit-1node-manager-all-{stream}
+                vtn-csit-1node-manager-all-{stream},
+                vtn-csit-1node-coordinator-only-{stream}
 
         - stable-lithium:
             branch: 'stable/lithium'
                 vpnservice-csit-1node-vpnservice-only-{stream},
                 vpnservice-csit-1node-vpnservice-all-{stream},
                 vtn-csit-1node-manager-li-only-{stream},
-                vtn-csit-1node-manager-li-all-{stream}
+                vtn-csit-1node-manager-li-all-{stream},
+                vtn-csit-1node-coordinator-only-{stream}
 
         - stable-helium:
             branch: 'stable/helium'
                 vtn-csit-1node-imds-manager-only-{stream},
                 vtn-csit-1node-imds-manager-all-{stream}
 
+
+
 # Template: integration-verify-python
 # Goal: Verify python scripts correct syntax
 # Operation: This job template performs a python tox check on any integration/test patch
         - integration-patch-refspec:
             branch: '$GERRIT_REFSPEC'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            # {jdk} is from releng-defaults
+            jdkversion: '{jdk}'
 
     scm:
         - integration-gerrit-scm:
         - integration-bundleurl:
             bundleurl: 'last'
         - integration-jdk-version:
-            jdkversion: 'openjdk7'
+            jdkversion: '{jdk}'
 
     triggers:
         - timed: 'H H * * 6'
               predefined-parameters:
                   BUNDLEURL=$BUNDLEURL
 
+                  JDKVERSION=$JDKVERSION
+
     publishers:
         - email-notification:
             email-prefix: '[integration]'
index 73253f7cb53b9954925e4c3dece409d909cb68b0..e530ddf8c7d7fc23cc8f2dd7500b74049d01263d 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index c363932ec3190e1116e166aa1ed80b11040ecf24..2b4233fab3e36260180305f3be3ce2fa1053f58d 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 640d0bc39ae2a9537415734436cbb5151078d1e0..d1ddbc7fd9a7b547f1f4d63d65ce0d60095aad26 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index b951c8762b541131571a8235d08d34cda84b3e57..ce896a32916735f5faa6da00f588d2fd263533ba 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 4b3f58e263720fe78abc18454b238bdadc2af7b6..44cc627be56405bbcfb635da5a2e1b53fe584db4 100644 (file)
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 56be3d3581cd4ade147580a4be29f4768f24d5b6..24a427082be83b7bd2bad737524e9ffc3370dfd1 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 65683b395cc3ef4e8ea3a48eeadeffd37c3d42a4..db204ae30260df6b882100f6f11fdf7de1b9d30c 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index e8f3fe526e6560f32992bdfb32c8c29dbd7a990f..19e18dc9a28bffdcda978b15821f309596b6b0a6 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index f48d0002ae15dc4eb12134ed4520608be465a529..3a7a3311f4b057bc652db001602000ba32fa309c 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index b5b0891aee36bdc2e1ff14c072089fd2e7edf957..deca072b6b1d708f246e9d9e604ab77a59806504 100644 (file)
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 7ab459a32e8aa051ed2ecdf908f46257299b6f75..c7b63adb767ff737e23506a764f8c4119f2b167d 100644 (file)
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index c0ef799b30f3179736cdccc72a0e1e11a7388cc7..d551524a02ead372e68f7dfbf22dba9170983029 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index d6a5e614da57eada8bdc6200a6d03b9a28516a01..d1e64856991d0e1b95f2dd40cc521eea444f14dc 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 198d8a31a0a7d1b7b6c4a9517f1faaa0bc85b5ca..cf33ccb391385d58828051f2305b6e836642bcfe 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 61e3b8f6d1d531894cd1194ae937bf4ca1b37277..62a1b24e3192136797c7429791ca6875c66ddb29 100644 (file)
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
similarity index 95%
rename from jjb/mdsal/mdsal-csit-periodic-dsbenchmark-beryllium.yaml
rename to jjb/mdsal/mdsal-csit-periodic-dsbenchmark.yaml
index eb5a58aff34ef8311b138fe8427d979bdef66f83..4bce66285febffe41284968a3902bf76af584d53 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 9db00d8fe48897b49a183c877d25a7aaef3ee285..11dfd6ede56931e14769b6b93e1d60ec61c99912 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 35b4800ec015085abf1f0ab004eed23d9f4cc9d2..ab00be3a6808b0bea4782cf0ec706d19f4db86b0 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 68e8bbc61307ca6415d235b14227fcaf1eb94094..aa9147a8964e3e6511ffcdf8a5195a3e21c7590f 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 5540d97de029af2b0bda2b3f9040b116303b1957..f9c106af0933fc8ff6cb6c9eb686470c5af5d1df 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index b1991d86b40427ae675d743822862eba4a65363b..c0d727dbc44bfe55c21957f24392b54659ad7179 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index ead3e74a35c3dc06b4a7c23c9b072eeeb7a62459..fb2e6e3b80d6a74c161e3ffa6ea34061eec0846d 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 314a2e150ab6e36eab9b94bfc5145032b7bba1eb..b43d413194cf21fba3b9b1cc23d04ae753164f1c 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 146d369c549202acbf5b90b5709606fc40fe5b1c..5a1b56d9fe4415e839afb78bae23c88670d1d249 100644 (file)
@@ -2,7 +2,7 @@
     name: netconf-csit-userfeatures
     jobs:
         - '{project}-csit-1node-{functionality}-{install}-{stream}'
-        - '{project}-csit-verify-1node-{functionality}-{stream}'
+        - '{project}-csit-verify-1node-{functionality}'
 
     # The project name
     project: 'netconf'
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -29,7 +32,7 @@
     mininet-image: 'rk-c-el6-mininet'
 
     # Features to install
-    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all'
+    install-features: 'odl-restconf,odl-netconf-mdsal,odl-clustering-test-app,odl-netconf-connector-all,odl-openflowplugin-all'
 
     # Robot custom options
     robot-options: '-v NETOPEER_USER:root'
index cafb24120d540d89c2087a69a61e7171d4f966d8..c9cbdcdb3ac10b389cef8ac24c20915c92a95e37 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index a461eacc5d18a6e964cc0d8e4193a00e08d83cc5..7fc0dcdeb66fd2795f11e7a9027d5af215e15a2e 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 2bf93e37633a0d7105701cd1aa14f3cc8e59f9c5..5ba47ce45358941aab93d6e34e503243860bd17f 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index e319dafa94f1d6df2333af30f39a373133f0a75b..749b6b8adac6abe2ddeadc36b4893142c3c2d6c9 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 0ea91b17dc6029629ac0b68c28ca93abb41d9d63..982a12eb97eed39f36eb7cbef3c772a64381ac47 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index e98756894438f997e0784b361aa0b647c72320c3..8e3387ec92afd0671577829a5c4ca8e7762e8789 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -26,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-nic-core-service-mdsal,odl-nic-console'
+    install-features: 'odl-nic-console'
 
     # Robot custom options
     robot-options: ''
index a437bacd0a8d9544aa9fd5d8b732f61c6e7349b6..35675a3c80845eed778046ee7495037abf879975 100644 (file)
 
     # Project branches
     stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -22,7 +27,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-nic-core,odl-nic-console,odl-nic-renderer-vtn'
+    install-features: 'odl-nic-console,odl-nic-renderer-vtn'
 
     # Robot custom options
     robot-options: ''
index dd36d31e1951ab3715f1d54af4fef25f79769113..829297925fafea64438fbce3c1f3ad84a9bd3d08 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 5da17dac807ac68e89ecec90475e7be1513d0c67..cadc03d06ac570895cc6de16e0940e470ccf1502 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index be675d0c5a5c724265c25eed068b95f374a3a0e2..8d9d1f4e2528c1dcbba3a4137a901f9441f1eefc 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 776c2c303a78a2d2d275d5a8ef7cc3dce6ce9572..abcfaab1147a3bdb44295ca39cbf8d364f9cf485 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 7e52ce7d16e00d97ac7d6c908d3e71553e87bd8f..47fa7ff63968ed6aca2e491fad653b70b366e0ae 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 5fae0edd86f20a503dadb805ade6f80119239e35..ccbf77b3970fd3ae55a7b9956d94ef0540467fc8 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index e76dacc4cce233dda15e9bc49f1160ddde8b985a..45b6ad532b1e191dff42d9856a7f047100227fa2 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 8b21e0a7fcbb4f2e80074f9e2b53b40d00c567b3..fa73ce67ba97d334db2ef3fc3a18cb538e209d8f 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index ef8109471191fa60fe8a257f03827e2a9f53d562..0e525eaaaad19356d239a9d7f8aaa87e722d74f4 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 7afd5d1867635bf4bea8c0520044951037ed109a..e5a0393b60efb44142a1b2523aad85de8e732e5c 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 289bffdffe41719e0760e2808affd2a5d38bf54b..509838154894264ab2ba0bcda3e4fb6d15a61e51 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index d4c8f204e1127bc7ca1f232422417b70502103e9..5322ec2b64fb003d97d974ab548030ec328a46e9 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 8ee3b185ad251bd8a5211f51c9f11f238b1e3c12..ae62159e5c09b0916660fed5ea019ed852e145d7 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 4bd1b7f64f0cf331938a49f69739844f3e9ca06f..1c3381a156de7d421f28665bc8471687452fb4e6 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 58a5c711e82ad6e873c99e0082c6c64b235af4a6..2886a540ea5e5fa616f7b3d56742b69ba62a928b 100644 (file)
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index d712cf48f2a52c5bcbe5afb9023b07d4782869e8..513c76f8f98e3377094c6a925a4eaa067d5ffa8c 100644 (file)
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index d311dc6f6d7432cd05180e71a53c5e88efec3952..0e8baca8afbd16215a15a6e7108df9fb172c9a13 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 5e251b1c03ecae1ec9d96f86b9a1301fb846383d..9fedb2b4b4df8988109cd567072549b4780cd39d 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 299e599b37cab4cedd00eabc1f31b92c4ee8c67a..3688f2302e1155e0e3146abcaa7bb2dcd7086f4f 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index beef22f7945ce35076a5754a57c4314b59d50a36..32eca642ef06edb56829285b67bdf8cb26b70fbc 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index f2ce6f9d506d5586bad7a4a92604118c08ec334b..074efdeb92c449d4ca938720b2a3908695666d1d 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 73f609130a2832610b5a53c534b42de5ccfdc66e..de887394381a0cfeb04e1648ba5733d61668a451 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index f86eca21ef4cd086c49fa43d8f2ddfb419fc3826..10ffcb19cfb7bdad2465c26126106f2483eb63dc 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 534af2ac7e2261a8a25f9830505c7cd6fd54d608..82fb0c5be92d00cc380cd9421c2541f9421a1985 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index fedd2c30e39cd6f613db3c07074ad96a2960247a..74a9d79a0f8ffdba0fd11bab1322e1f496039f3e 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index e14a6f73191676fb2e5fda01185ae87716d65007..48afc44a27cd197dd7cd1ee0c016d41bb545a972 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index e98cfbc348feaee9ee5cba8c1868a7ae51777b05..c3fa7821afbd8360a22e842c3b5adad124907b32 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 9598ce0b1fe4d8faa0ee49689103f04af6c69fcf..40fa620d116e4aac2b0d8953772b5e136e133f00 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index eee00221e006eaa2ea557b9feb453ecba9dbf54b..239e8d3de3139b4a402364f4b90bc2d248dbea2f 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 4ca8ded163d84081605b90d5866bcbad479dfeb6..6b6a4908a4bccbc7823a2db16d34f03e8e3c5a18 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index ad95d3698adea6a926626d28929b17743bce4a2f..544a489c1c2841fab416db79a6b4fecebf30f4ef 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index d7aa3a9c76a152a0830149e1ba263fcd50e983ee..9ee8ba8bc033f506f67cdf2651f01c98683113c0 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index ca121003687acebad9fc09d9b2adf7685dcf600b..15ae0c976fbb0049131372e0d3b2b909dc69c1d3 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 4b941192c067bd96d05387d7ae3f954eaec47342..545dc87b36080d2b5804fc7c35285f5a9d888a51 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 811c551f0cbfc0a00cb38472fd1f96236ca63fe5..2ccc23a874a56df59b8e55da2f9c7d0b072782a9 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index ea17f351bf82913dab24a1cc289073ea959828e6..32f8ce502c6a0cb9e5284da6cbaa145c0b1c1fbe 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index aea82e45d4da1e732ab2251faaeacf89ce0c135d..f10e419c15fbbd2160cc4f71095d654b6b20aa85 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index b696a8117b78aa57c3f2a0eab94ddd91b3722ae7..e40462783f2e9f0e68b537a88a5fa81adfc9a6c4 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 08faf851231e374bee3053a68242e992948d3d96..432986711b5985fe8f98ba60a904aebefb3f5ad6 100644 (file)
@@ -13,6 +13,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 32307839697fa8a5b4dd74e0ec69540dc8dad17b..f9185b98a1102cf64c11ac03808c4894ade6e219 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 43d6b5e06121366a95b400814b1a91b9cc075df1..5d1bf3d35f2895ad7360d24418e99d31183bdeff 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 6ac8f707692d0aa8061de9d308686959ccc2f845..6b2e4d75fdd51883973029a0607933680aebd4ba 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 8349d067e5c526d8460f6e3ddbf351b1582418f3..4d4861c76561d01ce748ec534d3e5a0306bab1f7 100644 (file)
     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'
index 8ce116a7faa95650a916c6ccc93a4bf57932f7b1..2adbc8d251e7cf13b65cd66a553f91f09ebd2d1f 100644 (file)
@@ -20,7 +20,7 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: 5
@@ -84,7 +84,7 @@
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
+        daysToKeep: 7
         numToKeep: 10
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
 
 - job-template:
     name: 'builder-weekly'
+    disabled: true
     node: jjbuilder
 
     # builder-weekly job to run JJB update weekly
     project-type: freestyle
 
     logrotate:
-        daysToKeep: 30
-        numToKeep: 40
+        daysToKeep: 7
+        numToKeep: 3
         artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
 
     logrotate:
         daysToKeep: 7
-        numToKeep: 10
+        numToKeep: 3
         artifactDaysToKeep: -1
         artifactNumToKeep: -1
 
index c60ad5b4d5e8c7cd395b27d096019a6829be08d0..5da3704095c753feb7b2c165118b8ef15179d756 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index d29af4fa47cf8258e293d5fcd1a136acbe3f8817..8823844c915c08a15c40cbcc56ad1d79ea81af1c 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index c8ef5fcad379715151871738bf1bdf5e942d566a..5ae3e9031e1f1bec1195740328ab79c06ce4b011 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 36514ba602040740027671a820f5a8118c590cf9..69d0a40a373f2d91d2fab46272457fe90ebe23a0 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 88ac908f8c141bbf6e58a900ff72ff96555fd5ec..50ba94e6678cbef2e9935fa95e1a0cba89bade6d 100644 (file)
@@ -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}'
index f0071f259c450f4938d77d34147412a44899d69a..9377c165439ec8f6493708032a8eb83c4bc8f8fd 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index a1db9d56b425a73ba3dbcf1d092e16b0f5323ddf..5f335e54fe7b643fe6d281efee37aa772bcf23ac 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 41eb2f79fb3ec5dd3b47ec68374daeccd0f065ed..a54979c5881b63ac0c4d376bf0cfed5b6a6e78eb 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index f7c344016b7a4ea57ad0377e8f80b4eeda652d78..f174c82ae83199eaff228aba60529aa576276d51 100644 (file)
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium
index 9c0fc887d2d5d4b7c8bacf3786d88c90637e92bb..f7fbc4a550b3ff7f824946208ab44dde2c35464e 100644 (file)
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 8ef69213a31582796a775676e6624f31786addcd..08c8642e77309d0ba16d06f14a50d07d0e634d7a 100644 (file)
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium
index 5d64f1302cba9b734beb8536f61c6caed47ff392..d9f024ba8387f40fe57a63502d2ecc810b289f70 100644 (file)
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 01db60f5b509c56fe91e802230958801b6b383e3..e616ddd3c64bf45a10fde567b2da3be7815050b9 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index b84c79784c87f277db70468333bb60694f5e524e..a7b5dbfb8f901aa2e5e410c932d83cf97bb055a0 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index c84c9012d8b7a90b9fdebea9656d09737fb3b6c7..f658c59189b28bcc143fa0ff314bb2ca3bd8ff87 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index ffd882791c8b7b95bbbe67393633fe56e623da7f..f9668e42226d216573758fa139a4c50beff1dfaa 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 6dca5c6443728249d2817288f01e9cc1643f5f3c..b1340eae0b3966d60d5e89268105a9ac67cb8534 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 92b68fffac680fd9738c3f732a8e437574ad55e6..8ec3d3b75baaa09945f276b49270ccbfb0304e35 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 9d9644c6e07d6ce28fdf2349f78c943a867a1154..0bd6ccecbc3566c790efaa5a688f4f09d32a282a 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 81e17c8166d7d36f0a2ff496f66eb6d1a4e284ba..56539a19148fe6246a6e4c879324d97682c0e19c 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -26,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector'
+    install-features: 'odl-restconf,odl-tsdr-cassandra,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
     robot-options: ' '
index 148ce772f0a5d8c0a8103e77b7208ce0b8a16af9..5aa11c15bbf86df568dfae3d685365b0da011e10 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -26,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector'
+    install-features: 'odl-restconf,odl-tsdr-hbase,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
     robot-options: ' '
index e2f1c0720e67c560bc9da623c8336cabf2d79d34..f3428a4ac37d4874f209bfb2e41624696df64fc8 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
@@ -26,7 +29,7 @@
             scope: 'all'
 
     # Features to install
-    install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector'
+    install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
 
     # Robot custom options
     robot-options: ' '
index fe2a6dfd2b1dd2657831bbf4ed731d5e16f6ac21..92a6c860d2cbf8181a699df02cfdca55f344f9a3 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 77252b9ec4b1f4e67827767e2095ffe8325ca60a..1b76de23a91e6e2845001fd755c4ce2bf1a802e2 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 10e2c19a269ec298bb90aa6e08659ca401902f61..e23f0913fad6b40a093ee952a2872422104739a1 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 3aaf535acbcfb6ca7e4a5187c142a88ce3d1330a..12bf982c5d3048d9fcbcdb253979a35f9a83ead7 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 20d50101be07f0c393c733e59c56bec49cc2b89f..107b570df29b3b6e5a50573f3b9429d0c4ae492c 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 8f00ec06ec2001a19a82f086d04d1edaf784ddc2..03e302bea847905597cf7c25a05ef757044d8cf1 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index a16717a2b7131f28c8bcf13855340e73a7f40e72..d0fb0133d364b67fec6f0d0579e180b7be6811a9 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 33a361620fc760c37223fe9ef0bf583945e8cf2d..55e1ad2426b875f748cdd7ef5338832bda4e77e9 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 8f80816ef12794c767c5181827ceb9fe9246faa5..ffd980747a35bb1aabc51d3af8fb554438469b97 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 72987232f57db068c43d245cd0a5305d66c10f8f..903e269657935aab58a6732e727222569cc03df2 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 3c19e4e1ddc624460476467c1900d3d0b4eb395d..1b2d27523cddc142472985f5c9d60c5f688b7224 100644 (file)
     stream:
 #        - boron:
 #            branch: 'master'
-#        - beryllium:
-#            branch: 'stable/beryllium'
+#            jdk: 'openjdk8'
+        - beryllium:
+            branch: 'stable/beryllium'
+            jdk: 'openjdk7'
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 0691c320e478c6da56dd96b067ca53d269b43ae7..6e64e6651eb2d30e00f3b53c5bdb8ca6c3c7c572 100644 (file)
@@ -14,6 +14,7 @@
     stream:
         - stable-helium:
             branch: 'stable/helium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 2f149ee613735c81b345d5ad5b516b081b08dbd9..ee6b0499495751e6694683918e6370570fa1f1a9 100644 (file)
@@ -14,6 +14,7 @@
     stream:
         - stable-lithium:
             branch: 'stable/lithium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index c9a5716ef4d790eb95a6e6bd9510a76d1f1c6049..95b4a9039e546f96ec70b56fea36ecb1a96b3e1a 100644 (file)
     stream:
         - boron:
             branch: 'master'
+            jdk: 'openjdk8'
         - beryllium:
             branch: 'stable/beryllium'
+            jdk: 'openjdk7'
 
     install:
         - only:
index 81b804661707c32917a528ab385591a5e8504bbf..840f0dcb4acd822fc625ffa72074f69adde11f68 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 2abddfa00a956bbcc1d74742e9d289314f0b2472..af0c70133a14d916b8e26cb1bb2979663388e2f2 100644 (file)
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
index 364f35509291be2af8a25b6a19a8c617aaec4b89..57477d8c8f3d63f76cbb8f3274ca3abe568402a0 100644 (file)
@@ -30,8 +30,6 @@
 
     # {mvn*} values are defined in releng/builder jjb/releng-defaults.yaml
     maven:
-        - mvn31:
-            mvnver: '{mvn31}'
         - mvn32:
             mvnver: '{mvn32}'
         - mvn33:
index 9bb6764390d61957920432dfc93f440473730686..c82c522a8f8aef92f829bf2287dd30e60bcdc5fb 100644 (file)
@@ -70,8 +70,8 @@
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'