X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flacp%2Flacp.yaml;h=bb78959543172bc573bcabc6abd98aac0dc40494;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=a092116b30d0a39f3ec5e32c71c9b6543c3d54af;hpb=d2932592d1c8707227c1cdaf05bffc45c63b36a8;p=releng%2Fbuilder.git

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index a092116b3..bb7895954 100644
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -2,17 +2,15 @@
 - project:
     name: lacp-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -25,20 +23,21 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
 - project:
     name: lacp-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -51,21 +50,22 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
 - project:
     name: lacp-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'lacp'
     project-name: 'lacp'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -78,37 +78,13 @@
     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}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'lacp'
-    project-name: 'lacp'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    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-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'lacp'
     project-name: 'lacp'
     branch: 'master'