X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flacp%2Flacp.yaml;h=e6dbe368042633c20238d24e342464231cb0e463;hb=8ad961fad6d4a35e7447e62ebf98191795ac82dc;hp=6502bc4e9bf87ad300cee6cb1febbec2d4928951;hpb=9d8b15f65026014c8ce8b659e3ca4963e2bdc45f;p=releng%2Fbuilder.git

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 6502bc4e9..e6dbe3680 100644
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -4,10 +4,10 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      # TODO uncomment the below line once lacp is added back to Carbon
-      # - '{project-name}-validate-autorelease-{stream}'
+      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
@@ -32,7 +32,6 @@
     jobs:
       - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-validate-autorelease-{stream}'
@@ -84,35 +83,6 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
-- project:
-    name: lacp-beryllium
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: beryllium
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/beryllium'
-    karaf-version: karaf3
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - openjdk8
-    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-sonar
     jobs: