X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Farmoury%2Farmoury.yaml;h=e397334a5d848f13ea27ab1d34b1fc5276791b89;hb=7b80a2bb2c004a4fd29c36c337de01610b718446;hp=59deaee0229e7671626f7c1546b920cbfa6bb0e4;hpb=0c5a56affd594ef2d369866b2ab094da039b2294;p=releng%2Fbuilder.git

diff --git a/jjb/armoury/armoury.yaml b/jjb/armoury/armoury.yaml
index 59deaee02..e397334a5 100644
--- a/jjb/armoury/armoury.yaml
+++ b/jjb/armoury/armoury.yaml
@@ -1,42 +1,89 @@
-# ODL Releng build templates
 - project:
-    name: armoury
+    name: armoury-carbon
     jobs:
         - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
         - '{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}-{jdks}'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-                - openjdk7
-            disable_autorelease: True
-            disable_distribution_check: False
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-                - openjdk7
-            disable_autorelease: True
-            disable_distribution_check: False
+    stream: carbon
+    project: 'armoury'
+    project-name: 'armoury'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: 'mvn33'
+    mvn-settings: 'armoury-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: ''
+    email-upstream: '[armoury]'
+    archive-artifacts: ''
 
+- project:
+    name: armoury-boron
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: boron
     project: 'armoury'
     project-name: 'armoury'
+    branch: 'stable/boron'
+    jdk: openjdk8
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: 'mvn33'
     mvn-settings: 'armoury-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
+    mvn-goals: 'clean install'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: ''
     email-upstream: '[armoury]'
     archive-artifacts: ''
+
+- project:
+    name: armoury-beryllium
+    jobs:
+        - '{project-name}-clm-{stream}'
+        - '{project-name}-integration-{stream}'
+        - '{project-name}-merge-{stream}'
+        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+
+    stream: beryllium
+    project: 'armoury'
+    project-name: 'armoury'
+    branch: 'stable/beryllium'
+    jdk: openjdk7
+    jdks:
+        - openjdk7
+        - openjdk8
+    maven:
+        - mvn33:
+            mvn-version: 'mvn33'
+    mvn-settings: 'armoury-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
+    dependencies: ''
+    email-upstream: '[armoury]'
+    archive-artifacts: ''
+
+- project:
+    name: armoury-sonar
+    jobs:
+        - '{project-name}-sonar'
+
+    project: 'armoury'
+    project-name: 'armoury'
+    branch: 'master'
+    mvn-settings: 'armoury-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'