X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcapwap%2Fcapwap.yaml;h=9c87714fb8fbf8d59302f172a1b1a913fccd8954;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=f6188adea7be9624d2e04bd447e00cef657f5fe3;hpb=b5be33b878d75af8df189ee55974405b9a08dff1;p=releng%2Fbuilder.git

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index f6188adea..9c87714fb 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: capwap-nitrogen
+    name: capwap-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}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,48 +23,21 @@
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
-- project:
-    name: capwap-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}'
-
-    stream: carbon
-    project: 'capwap'
-    project-name: 'capwap'
-    branch: 'stable/carbon'
-    jdk: openjdk8
-    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-boron
+    name: capwap-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}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -80,23 +50,23 @@
     email-upstream: '[capwap]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
+
 - project:
-    name: capwap-beryllium
+    name: capwap-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}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: beryllium
+    stream: carbon
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -108,10 +78,13 @@
     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'