X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fofextensions%2Fcircuitsw%2Fcircuitsw.yaml;h=2cdba404694c2c9a8605b46ab533ed627ce6f26e;hb=209a7c633bb8b389806ac69e70c8f7570f913e01;hp=04e990773f0ead5984cb1e5533cd0f287e088058;hpb=65b1a4aadbdc67955f7a74d122e26a530b1f987f;p=releng%2Fbuilder.git

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 04e990773..2cdba4046 100644
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,89 +1,78 @@
+---
 - project:
-    name: circuitsw-carbon
+    name: circuitsw-fluorine
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: fluorine
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
+- project:
+    name: circuitsw-oxygen
+    jobs:
+      - odl-maven-jobs
+
+    stream: oxygen
+    project: 'ofextensions/circuitsw'
+    project-name: 'circuitsw'
+    branch: 'stable/oxygen'
+    mvn-settings: 'ofextensions-circuitsw-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[circuitsw]'
+
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
 
 - project:
-    name: circuitsw-boron
+    name: circuitsw-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
 
 - project:
-    name: circuitsw-beryllium
+    name: circuitsw-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
-    jdks:
-        - openjdk7
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+    branch: 'stable/carbon'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
 
 - project:
     name: circuitsw-sonar
     jobs:
-        - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
     mvn-settings: 'ofextensions-circuitsw-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'