Merge "Increase ocata packer timeout from 60m to 75m"

[releng/builder.git] / jjb / ofextensions / circuitsw / circuitsw.yaml

diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 4a56593fe4ba0d1277e633486bd53e33eafbdb28..66bfcae955ae94def68574b7a918a826500f8ae1 100644 (file)
--- a/jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/jjb/ofextensions/circuitsw/circuitsw.yaml
@@ -2,10 +2,8 @@
 - 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'
@@ -23,13 +21,14 @@
     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'
@@ -47,13 +46,14 @@
     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'
@@ -71,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'