Merge "Adding installation for Syslog and Netflow"

[releng/builder.git] / jjb / capwap / capwap.yaml

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index d3512001d3439dea38af626a9b5ccc6d208c7d12..701eb35c5e34730703c97b91114f5be2b3cf0ad6 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -19,20 +19,19 @@
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
-        - beryllium:
+        - boron:
             branch: 'master'
-            jdk: openjdk7
+            jdk: openjdk8
             jdks:
-                - openjdk7
                 - openjdk8
-            disable_autorelease: True
-        - pre-boron:
-            branch: 'pre-boron'
+            disable_autorelease: False
+        - beryllium:
+            branch: 'beryllium'
             jdk: openjdk7
             jdks:
                 - openjdk7
                 - openjdk8
-            disable_autorelease: True
+            disable_autorelease: False
         - stable-lithium:
             branch: 'stable/lithium'
             jdk: openjdk7
@@ -168,6 +167,7 @@
                 - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
             name: 'capwap'
             branch: '{branch}'
@@ -234,6 +234,7 @@
 
 - job-template:
     name: 'capwap-periodic-{stream}'
+    disabled: false
 
     # Job template for periodic builders
     #
@@ -426,10 +427,11 @@
 
 - job-template:
     name: 'capwap-sonar'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
-    jdk: 'openjdk7'
+    jdk: 'openjdk8'
 
     logrotate:
         daysToKeep: '7'
@@ -486,6 +488,7 @@
 
 - job-template:
     name: 'capwap-clm-{stream}'
+    disabled: false
 
     project-type: maven
     node: dynamic_verify
@@ -525,7 +528,7 @@
     maven:
         maven-name: '{mvn33}'
         root-pom: 'pom.xml'
-        goals: 'clean install -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+        goals: 'clean install com.sonatype.clm:clm-maven-plugin:index -Djenkins -DskipTests=true -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
         maven-opts: '-Xmx4096m -XX:MaxPermSize=512m'
         settings: '{capwap-settings}'
         global-settings: '{odl-global-settings}'