Merge "Reduce number of logs kept for merge and periodic jobs"

diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml
index 8443e1c8ddf9382fd31fc4bcd267948a9e044258..8e3387ec92afd0671577829a5c4ca8e7762e8789 100644 (file)
--- a/jjb/nic/nic-csit-basic.yaml
+++ b/jjb/nic/nic-csit-basic.yaml
@@ -29,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: ''

diff --git a/jjb/nic/nic-csit-vtnrenderer.yaml b/jjb/nic/nic-csit-vtnrenderer.yaml
index 4123c4a7737353de4b8154d2b804206ed1f22b9c..35675a3c80845eed778046ee7495037abf879975 100644 (file)
--- a/jjb/nic/nic-csit-vtnrenderer.yaml
+++ b/jjb/nic/nic-csit-vtnrenderer.yaml
@@ -12,6 +12,10 @@
 
     # Project branches
     stream:
+        - boron:
+            branch: 'master'
+        - beryllium:
+            branch: 'stable/beryllium'
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: 'openjdk7'
@@ -23,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: ''

diff --git a/jjb/snmp/snmp.cfg b/jjb/snmp/snmp.cfg
index f7c344016b7a4ea57ad0377e8f80b4eeda652d78..f174c82ae83199eaff228aba60529aa576276d51 100644 (file)
--- a/jjb/snmp/snmp.cfg
+++ b/jjb/snmp/snmp.cfg
@@ -1,7 +1,7 @@
 STREAMS:
 - boron:
     branch: master
-    jdks: openjdk7,openjdk8
+    jdks: openjdk8
     autorelease: true
 - beryllium:
     branch: stable/beryllium

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 9c0fc887d2d5d4b7c8bacf3786d88c90637e92bb..645dfa0ab089632128e3cef5cab242e117438bbc 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium:

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 5d64f1302cba9b734beb8536f61c6caed47ff392..a3c6443e5ab447a5b9b4099057f8c354b09de62a 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -21,9 +21,8 @@
     stream:
         - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
             disable_autorelease: False
         - beryllium: