Merge "Migrate atrium matrix-verify jobs to freestyle-verify jobs"

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index c9fc98c9008b6819e7547271182202914c6f294a..b2944050378b54f40b0fdd9edbcff34a454974a6 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -1,6 +1,5 @@
-# ODL Releng build templates
 - project:
-    name: atrium
+    name: atrium-boron
     jobs:
         - '{project-name}-clm-{stream}'
         - '{project-name}-distribution-{stream}'
@@ -8,26 +7,37 @@
         - '{project-name}-integration-{stream}'
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
-        - '{project-name}-sonar'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
             disable_autorelease: True
             disable_distribution_check: False
 
     project: 'atrium'
     project-name: 'atrium'
+    branch: 'master'
+    jdk: openjdk8
+    maven:
+        - mvn33:
+            mvn-version: '{mvn33}'
     mvn-settings: 'atrium-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
     archive-artifacts: ''
+
+- project:
+    name: atrium-sonar
+    jobs:
+        - '{project-name}-sonar'
+    project: 'atrium'
+    project-name: 'atrium'
+    branch: 'master'
+    mvn-settings: 'atrium-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'