Remove {project}-integration-{stream} jobs

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

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index f6aa2617fd5545496ee5c42a9db0cabbf8240c14..1358a5e88d4f39de6fc2160589c00f900db9ca6a 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -1,87 +1,63 @@
 ---
 - project:
-    name: yangide-nitrogen
+    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: nitrogen
+    stream: oxygen
     project: 'yangide'
     project-name: 'yangide'
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: fba306956f98
 
 - project:
-    name: yangide-carbon
+    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: carbon
+    stream: nitrogen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/carbon'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: fba306956f98
 
 - project:
-    name: yangide-boron
+    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: boron
+    stream: carbon
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     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'
     branch: 'master'
     mvn-settings: 'yangide-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'