Merge "Add Oxygen stream for OpFlex release job."

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 9f645330341ca7201ccf4895564786b4b479970a..959f359e423fe6c479e8f3fe372c3cd94fdb92db 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,47 +1,77 @@
 ---
 - project:
-    name: odlparent-nitrogen
+    name: odlparent-master
     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-name}-verify-tox-{stream}'
       - '{project-name}-maven-jobs'
 
-    stream: nitrogen
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: 'master'
+    project: odlparent
+    project-name: odlparent
+    stream: master
+    branch: master
+    distribution_branch: master
+
     jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: mvn33
-    mvn-settings: 'odlparent-settings'
-    mvn-goals: 'clean install'
+    mvn-settings: odlparent-settings
+    mvn-goals: clean install
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: mvn33
+
+    dependencies: ''
+    email-upstream: '[odlparent]'
+    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
+
+- project:
+    name: odlparent-2.0.x
+    jobs:
+      - '{project-name}-merge-{stream}'
+      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
+
+    project: odlparent
+    project-name: odlparent
+    stream: 2.0.x
+    branch: 2.0.x
+    distribution_branch: master
+
+    jdk: openjdk8
+    jdks:
+      - openjdk8
+    maven:
+      - mvn33:
+          mvn-version: mvn33
+    mvn-settings: odlparent-settings
+    mvn-goals: clean install
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-version: mvn33
+
     dependencies: ''
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
     # Used by the release job
-    settings-file: odlparent-settings
     staging-profile-id: 880d5ac25eaa
 
 - project:
     name: odlparent-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
 
     stream: carbon
     project: 'odlparent'
@@ -61,15 +91,17 @@
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-boron
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
     stream: boron
     project: 'odlparent'
@@ -89,6 +121,9 @@
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-sonar
     jobs: