Merge "Remove project cfg files as they are no longer used"

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 7cfa798c273efa2c347447b49932846b9b151ba3..be45ebe6198b375e42e61442b14f8d59592c834e 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -9,21 +9,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - boron:
-            branch: 'master'
-            jdks:
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'master'
     jdk: openjdk8
     maven:
         - mvn33:
@@ -45,22 +42,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - beryllium:
-            branch: 'stable/beryllium'
-            jdks:
-                - openjdk7
-                - openjdk8
             disable_autorelease: False
             disable_distribution_check: False
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'stable/beryllium'
     jdk:
         - openjdk7
         - openjdk8
@@ -85,21 +78,18 @@
         - '{project-name}-merge-{stream}'
         - '{project-name}-periodic-{stream}'
         - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}'
         - '{project-name}-verify-{stream}-{maven}-{jdk}'
 
     # stream:    release stream (eg. stable-lithium or beryllium)
     # branch:    git branch (eg. stable/lithium or master)
     stream:
         - stable-lithium:
-            branch: 'stable/lithium'
-            jdks:
-                - openjdk7
             disable_autorelease: True
             disable_distribution_check: True
 
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'stable/lithium'
     jdk: openjdk7
     maven:
         - mvn33:
@@ -116,14 +106,9 @@
     jobs:
         - '{project-name}-sonar'
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-
     project: 'odlparent'
     project-name: 'odlparent'
+    branch: 'master'
     mvn-settings: 'odlparent-settings'
     mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'