X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcapwap%2Fcapwap.yaml;h=3ecfeb5f1d20b904ce10d75ee8cf67494200764c;hb=ddbf3cde9195f2b3635318fed187269504853ab1;hp=d2a4240e7665fc05010790b5bf301ad8ef96421c;hpb=ed4729b7e4bd1e49713e90fd54d8d42abd9dec5f;p=releng%2Fbuilder.git

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index d2a4240e7..3ecfeb5f1 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,82 +1,52 @@
 ---
 - project:
-    name: capwap-oxygen
+    name: capwap-neon
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: neon
     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: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
 
 - project:
-    name: capwap-nitrogen
+    name: capwap-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: fluorine
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/fluorine'
     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}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - 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
@@ -84,11 +54,16 @@
 - 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'
+
+- view:
+    name: capwap
+    description: 'List of capwap jobs'
+    regex: '^capwap-.*'
+    <<: *releng_view_common