Revert "Disable lacp validate autorelease job"

[releng/builder.git] / jjb / lacp / lacp.yaml

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 7b13db3aee17d667d80f7f0461679f0f127a62d3..dfdeebce7c3b6618b46ff89618e5344b6d6d2985 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,9 +1,37 @@
 ---
+- project:
+    name: lacp-nitrogen
+    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: nitrogen
+    project: 'lacp'
+    project-name: 'lacp'
+    branch: 'master'
+    jdk: openjdk8
+    jdks:
+      - 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-carbon
     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}'
@@ -12,7 +40,8 @@
     stream: carbon
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'master'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -40,6 +69,7 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/boron'
+    karaf-version: karaf3
     jdk: openjdk8
     jdks:
       - openjdk8
@@ -67,6 +97,7 @@
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/beryllium'
+    karaf-version: karaf3
     jdk: openjdk7
     jdks:
       - openjdk7