X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fofextensions%2Fcircuitsw%2Fcircuitsw.yaml;h=66bfcae955ae94def68574b7a918a826500f8ae1;hb=ccaff4b13a69a8e501cbf672f2f45241cd7ec909;hp=c37c985946b651c1bfe3bcd5dfb132c448def8c4;hpb=26c20ade21e2629099602ca890b9a67f2b9a2586;p=releng%2Fbuilder.git

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index c37c98594..66bfcae95 100644
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -2,16 +2,13 @@
 - project:
     name: circuitsw-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     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-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -49,19 +46,19 @@
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a68970cf5b25c
+
 - project:
     name: circuitsw-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'stable/carbon'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -74,35 +71,13 @@
     email-upstream: '[circuitsw]'
     archive-artifacts: ''
 
-- project:
-    name: circuitsw-boron
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
-
-    stream: boron
-    project: 'ofextensions/circuitsw'
-    project-name: 'circuitsw'
-    branch: 'stable/boron'
-    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-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'ofextensions/circuitsw'
     project-name: 'circuitsw'
     branch: 'master'