X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Flacp%2Flacp.yaml;h=72c8ca70bf451829a1792bb49decbf754aa65a03;hb=7d16ac5800cc99d4b31f8a4a8070be9c6407e167;hp=dd1233505b2fbf2ee7521b02a080196e19d97848;hpb=b30e58394f7c9e1c7c354922cf2a27a83a0df15e;p=releng%2Fbuilder.git

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index dd1233505..72c8ca70b 100644
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -1,18 +1,15 @@
 ---
 - 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: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -25,22 +22,20 @@
     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}-validate-autorelease-{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
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -53,22 +48,21 @@
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96ff6c0ff6ab1
+
 - project:
-    name: lacp-boron
+    name: lacp-carbon
     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: boron
+    stream: carbon
     project: 'lacp'
     project-name: 'lacp'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     mvn-settings: 'lacp-settings'
@@ -81,10 +75,13 @@
     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'