Merge "Add a prefix variable to defaults as blank"

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

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 832627a470a86555223072e26d30cdb629505ef6..cd0617c9ca574738702cb2858f979ed0cb9e58cd 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -2,16 +2,13 @@
 - project:
     name: yangide-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: 'yangide'
     project-name: 'yangide'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -24,19 +21,19 @@
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-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: 'yangide'
     project-name: 'yangide'
     branch: 'stable/nitrogen'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -49,20 +46,20 @@
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-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: 'yangide'
     project-name: 'yangide'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -75,10 +72,13 @@
     email-upstream: '[yangide] [odlparent] [yangtools]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: fba306956f98
+
 - project:
     name: yangide-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
 
     project: 'yangide'
     project-name: 'yangide'