From: Vratko Polák <vrpolak@cisco.com>
Date: Thu, 4 Feb 2016 12:51:26 +0000 (+0000)
Subject: Merge "Reduce number of logs kept for merge and periodic jobs"
X-Git-Tag: release/beryllium~43
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0d90f86bec6d068d92ae8068e0c4bfd99d57073a;hp=a59fa943cb530740f19e3b100ff7af776c942902;p=releng%2Fbuilder.git

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 8443e1c8d..8e3387ec9 100644
--- 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 4123c4a77..35675a3c8 100644
--- 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 f7c344016..f174c82ae 100644
--- 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 9c0fc887d..645dfa0ab 100644
--- 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 5d64f1302..a3c6443e5 100644
--- 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: