Merge "Switch the csit-verify-1node to use job prefix"

[releng/builder.git] / jjb / yang-push / yang-push.yaml

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index 2bebf295005b7ec81a322c95d6f73c732d38f4b5..fc38e865bbb090e646dace59d4cee31627ca7982 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -2,11 +2,9 @@
 - project:
     name: yang-push-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'yang-push'
@@ -24,14 +22,15 @@
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yang-push'
@@ -49,14 +48,15 @@
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yang-push'
@@ -75,10 +75,13 @@
     email-upstream: '[yang-push]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a69aae2832869
+
 - project:
     name: yang-push-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'yang-push'
     project-name: 'yang-push'
     branch: 'master'