X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flacp%2Flacp.yaml;h=792f5ddb91495dff4b3bbb18512e3988e04920e4;hb=99c3309a180b6e72d78b1e23f357943b620abedf;hp=8f66995e8b9d7bf26d27745302f3f7e0ae5c7c46;hpb=30f651a1fc4515dda1e66f4b2f520502bcbd95bf;p=releng%2Fbuilder.git

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 8f66995e8..792f5ddb9 100644
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,87 +1,63 @@
 ---
 - project:
-    name: lacp-oxygen
+    name: lacp-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
-    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: ''
+
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
 
 - project:
-    name: lacp-nitrogen
+    name: lacp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
+    branch: 'stable/oxygen'
     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: ''
+
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
 
 - project:
-    name: lacp-carbon
+    name: lacp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
+    branch: 'stable/nitrogen'
     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: ''
+
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
 
 - project:
     name: lacp-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
     mvn-settings: 'lacp-settings'
-    mvn-goals: 'clean install javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'