X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcapwap%2Fcapwap.yaml;h=ed7c55974acef74738f032722437f1bf343b9b03;hb=0e0e34daa29f5cd386428cc72571b1e3dee6abfa;hp=768db6fbd8599feba4c4b32c930bd9d868106511;hpb=8d1cf7dd5a3b2810e0640bac08cab52d721419c9;p=releng%2Fbuilder.git

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 768db6fbd..ed7c55974 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,88 +1,46 @@
 ---
 - project:
-    name: capwap-oxygen
+    name: capwap-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: 'capwap'
     project-name: 'capwap'
     branch: 'master'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
-
-- project:
-    name: capwap-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}'
 
-    stream: nitrogen
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[capwap]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
 
 - project:
-    name: capwap-carbon
+    name: capwap-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: carbon
+    stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
 
 - project:
     name: capwap
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'capwap'
     project-name: 'capwap'
     branch: master
     mvn-settings: 'capwap-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'