X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flacp%2Flacp.yaml;h=2e031d7f1d2f8d4474df7d764029871264a1b06d;hb=81e724678beed8dca225970663f03eca0609d918;hp=915dc48648acee611a04a85a908a1d49c96fba31;hpb=b7a29b8100a7c634a823bc8712c76e1cdf3535d3;p=releng%2Fbuilder.git

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 915dc4864..2e031d7f1 100644
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,22 +1,14 @@
-# ODL Releng build templates
 - project:
-    name: lacp-boron
+    name: lacp-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}-validate-autorelease-{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:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
@@ -26,71 +18,63 @@
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            mvn-version: 'mvn33'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
 - project:
-    name: lacp-beryllium
+    name: lacp-boron
     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}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+
+    stream: boron
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/boron'
+    jdk: openjdk8
     jdks:
-        - openjdk7
         - openjdk8
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            mvn-version: 'mvn33'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
 - project:
-    name: lacp-lithium
+    name: lacp-beryllium
     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}-validate-autorelease-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - stable-lithium:
-            disable_autorelease: True
-            disable_distribution_check: True
+
+    stream: beryllium
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/lithium'
+    branch: 'stable/beryllium'
     jdk: openjdk7
     jdks:
         - openjdk7
+        - openjdk8
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            mvn-version: 'mvn33'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
@@ -104,5 +88,5 @@
     project-name: 'lacp'
     branch: 'master'
     mvn-settings: 'lacp-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'