Remove ARCHIVE_ARTIFACTS overwrite

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

diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml
index 7ed721fdf3bbaec33cbb6c8bbd9a35564b70b669..011a64509152faaf44dc196d48a83b7641355935 100644 (file)
--- a/jjb/yangide/yangide.yaml
+++ b/jjb/yangide/yangide.yaml
@@ -1,61 +1,66 @@
+---
 - project:
-    name: yangide-carbon
+    name: yangide-oxygen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    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-boron
+    name: yangide-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'yangide'
     project-name: 'yangide'
-    branch: 'stable/boron'
-    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-carbon
+    jobs:
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
+
+    stream: carbon
+    project: 'yangide'
+    project-name: 'yangide'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    mvn-settings: 'yangide-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
+    email-upstream: '[yangide] [odlparent] [yangtools]'
+
+    # 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'