X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flacp%2Flacp.yaml;h=1c136a5a3fbcc9757b57483a39695aaed81c598d;hb=8677c241183102bfef87c119de295c13fb2782e1;hp=7b13db3aee17d667d80f7f0461679f0f127a62d3;hpb=5d15e6506e2fedd8e0c6ad9c59d16c95b8986647;p=releng%2Fbuilder.git

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index 7b13db3ae..cdeed106f 100644
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,93 +1,45 @@
 ---
 - project:
-    name: lacp-carbon
+    name: lacp-fluorine
     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}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: fluorine
     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-boron
-    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: boron
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/boron'
-    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: ''
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
 
 - project:
-    name: lacp-beryllium
+    name: lacp-oxygen
     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}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: oxygen
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-      - openjdk7
-      - 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-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'