Create odlparent 2.0.x maintenance jobs

With odlparent releasing out of simrel we need to create new maintenance
jobs for odlparent 2.0.x. This change does the following:

- Renames nitrogen jobs to master
- Add new odlparent 2.0.x jobs
- Remove {project-name}-integration-{stream} jobs
  (odlparent does not use them as they do not have any upstream)
- Configure distribution_branch for both master and 2.0.x to master

Change-Id: I80525b94c623a3749f155950280556310d2ca7d6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 9f645330341ca7201ccf4895564786b4b479970a..2acae64741c24e69e1bb417a2c390c8153540468 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -1,29 +1,66 @@
 ---
 - 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'
 
+    project: odlparent
+    project-name: odlparent
     stream: nitrogen
-    project: 'odlparent'
-    project-name: 'odlparent'
-    branch: '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
+    settings-file: odlparent-settings
+    staging-profile-id: 880d5ac25eaa
+
+- project:
+    name: odlparent-2.0.x
+    jobs:
+      - '{project-name}-clm-{stream}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{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: ''