X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fofextensions%2Fcircuitsw%2Fcircuitsw.yaml;h=68b6c8c1aba36c37f02cea055bed449addb33194;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=12f7c54e11cc3ea85cd927b43b2eb5308770dcb6;hpb=0b70a82f3ae191c6939485df53d69b33fd9b6ad7;p=releng%2Fbuilder.git

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 12f7c54e11..68b6c8c1ab 100644
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,21 +1,20 @@
+---
 - project:
-    name: circuitsw-carbon
+    name: circuitsw-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: carbon
+    stream: oxygen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
-    jdk: openjdk8
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -23,24 +22,25 @@
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
 - project:
-    name: circuitsw-boron
+    name: circuitsw-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: boron
+    stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -48,25 +48,25 @@
     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}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
+      - '{project-name}-merge-{stream}'
 
-    stream: beryllium
+    stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
     jdks:
-        - openjdk7
-        - openjdk8
+      - openjdk8
     maven:
-        - mvn33:
-            mvn-version: 'mvn33'
+      - mvn33:
+          mvn-version: 'mvn33'
     mvn-settings: 'ofextensions-circuitsw-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -74,10 +74,13 @@
     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'