Merge "Create Carbon jobs for csit"

diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml
index a61a6dac86bc7d14b8f96674692d7a99c0af6f02..ab61658c3586f906a7a5426d0ff2d555a3c12508 100644 (file)
--- a/jjb/ovsdb/ovsdb-patch-test.yaml
+++ b/jjb/ovsdb/ovsdb-patch-test.yaml
@@ -24,6 +24,14 @@
                 ovsdb-csit-1node-southbound-all-{stream},
                 ovsdb-csit-3node-clustering-only-{stream}
 
+        - boron:
+            branch: 'stable/boron'
+            jdk: 'openjdk8'
+            csit-list: >
+                ovsdb-csit-1node-southbound-only-{stream},
+                ovsdb-csit-1node-southbound-all-{stream},
+                ovsdb-csit-3node-clustering-only-{stream}
+
         - beryllium:
             branch: 'stable/beryllium'
             jdk: 'openjdk7'

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index f4bb10dad3da73ce03dfe5646cf0bae8d56bf703..22e741a216e232f7382b6c27ba34e68303f6949a 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -540,7 +540,7 @@
     name: '{project-name}-validate-autorelease-{stream}'
     disabled: '{obj:disable_autorelease}'
 
-    project-type: maven
+    project-type: freestyle
     node: '{build-node}'
     concurrent: true
     jdk: '{jdk}'
@@ -607,7 +607,7 @@
                     - compare-type: ANT
                       pattern: '**/*.xml'
 
-    prebuilders:
+    builders:
         - jacoco-nojava-workaround
         - autorelease-checkout-gerrit-patch
         - autorelease-generate-release-patches
@@ -616,25 +616,21 @@
             pom: validate-pom.xml
             goals: 'clean install dependency:tree -V -B -T1.5C -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
             java-opts:
-            - '-Xmx8g'
+              - '-Xmx8g'
+            settings: 'autorelease-settings'
+            settings-type: cfp
+            global-settings: 'odl-global-settings'
+            global-settings-type: cfp
+        - maven-target:
+            maven-version: '{mvn33}'
+            pom: 'pom.xml'
+            goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            java-opts:
+              - '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
             settings: 'autorelease-settings'
             settings-type: cfp
             global-settings: 'odl-global-settings'
             global-settings-type: cfp
-
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean validate -V -B -Pq -Djenkins -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
-        maven-opts: '-Xmx8g -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
-        settings: 'autorelease-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        automatic-archiving: false
-        post-step-run-condition: UNSTABLE
-
-    postbuilders:
         - autorelease-sys-stats
 
     publishers: