X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flacp%2Flacp.yaml;h=e2aeb79dce7d2acac35104ebab7b97ea12fdfa2f;hb=68ed4905bdb6ee0bec6d182122022c7b295df36c;hp=da994a30d24e9016ce5f09928d28689745bae4fd;hpb=7b89d05fcdf66c989d52bd8f82e6f42c3b238cb8;p=releng%2Fbuilder.git

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index da994a30d..e2aeb79dc 100644
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -10,12 +10,7 @@
         - '{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:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: carbon
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
@@ -25,7 +20,7 @@
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
@@ -44,12 +39,7 @@
         - '{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: boron
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/boron'
@@ -59,7 +49,7 @@
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
@@ -77,10 +67,8 @@
         - '{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: beryllium
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/beryllium'
@@ -91,38 +79,7 @@
     mvn-settings: 'lacp-settings'
     maven:
         - mvn33:
-            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
-    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
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/lithium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-    mvn-settings: 'lacp-settings'
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+            mvn-version: 'mvn33'
     mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'