X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcapwap%2Fcapwap.yaml;h=a99c63d1a7052b6f93543068e9e697ffa0171834;hb=refs%2Fchanges%2F83%2F68683%2F11;hp=cd35bad16e067374c3f1b403a62b49b8ed708dc6;hpb=080fb68b1be17e93a68e864065c56b8a84ead8f8;p=releng%2Fbuilder.git

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index cd35bad16..6836282e6 100644
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -1,117 +1,84 @@
+---
 - project:
-    name: capwap-carbon
+    name: capwap-fluorine
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
+    stream: fluorine
     project: 'capwap'
     project-name: 'capwap'
     branch: 'master'
-    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-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
+    stream: oxygen
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    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-beryllium
+    name: capwap-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: nitrogen
+    project: 'capwap'
+    project-name: 'capwap'
+    branch: 'stable/nitrogen'
+    mvn-settings: 'capwap-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[capwap]'
+
+    # Used by the release job
+    staging-profile-id: 96bd6b5bf86e3
+
+- project:
+    name: capwap-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - odl-maven-jobs
 
+    stream: carbon
     project: 'capwap'
     project-name: 'capwap'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     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'