X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fofextensions%2Fcircuitsw%2Fcircuitsw.yaml;h=1f892da2846febce78094d72240097ae54230da6;hb=b7cf4bc22e7a89d280ec1eff3ef3693c559074eb;hp=ccd0d86c4f4181f6dadee5fd7179dc23a2843df4;hpb=5d15e6506e2fedd8e0c6ad9c59d16c95b8986647;p=releng%2Fbuilder.git

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index ccd0d86c4..1f892da28 100644
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -1,17 +1,14 @@
 ---
 - 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}-maven-jobs'
 
-    stream: carbon
+    stream: oxygen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -24,19 +21,19 @@
     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}-maven-jobs'
 
-    stream: boron
+    stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -49,21 +46,20 @@
     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}-maven-jobs'
 
-    stream: beryllium
+    stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -75,10 +71,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'