Merge "Configure tep-ip for genius auto tunnels"

[releng/builder.git] / jjb / cardinal / cardinal.yaml

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 16e151fd39d0566fda95dc960aeb26d097258caa..3880e23be198d844ec3cf8231b4e34bb7a61c762 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -2,11 +2,10 @@
 - project:
     name: cardinal-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: oxygen
     project: 'cardinal'
@@ -24,14 +23,16 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: nitrogen
     project: 'cardinal'
@@ -49,14 +50,16 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
     stream: carbon
     project: 'cardinal'
@@ -75,10 +78,13 @@
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96be20348f0f2
+
 - project:
     name: cardinal-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'cardinal'
     project-name: 'cardinal'