Do not specify jre or jdk if default value applies

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

diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml
index c20bc7d9c142a4a9271f3510e62c56d021c46699..81c4fc7ff63ca6ae71c1bbfd1ac632566a79df1e 100644 (file)
--- a/jjb/coe/coe.yaml
+++ b/jjb/coe/coe.yaml
@@ -1,4 +1,29 @@
 ---
+- project:
+    name: coe-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}'
+
+    project: 'coe'
+    project-name: 'coe'
+    stream: oxygen
+    branch: 'master'
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: 'mvn33'
+    mvn-settings: 'coe-settings'
+    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
+    email-upstream: '[coe] [odlparent] [yangtools] [controller]'
+    archive-artifacts: ''
+
 - project:
     name: coe-nitrogen
     jobs:
@@ -11,8 +36,7 @@
     project: 'coe'
     project-name: 'coe'
     stream: nitrogen
-    branch: 'master'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -38,7 +62,6 @@
     stream: carbon
     branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven: