Migrate odlparent to using global-jjb CLM jobs

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

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index 620023578bf352874727fd8bb99deaf3cf1e494b..f36c9e3ec9a4bc64d61d3462a6b460b4cbb53eec 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,7 +2,6 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-merge-{stream}'
       - '{project-name}-verify-{stream}-{maven}-{jdks}'
@@ -31,13 +30,11 @@
     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}'
@@ -66,18 +63,17 @@
     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}-verify-{stream}-{maven}-{jdks}'
       - '{project-name}-verify-tox-{stream}'
+      - '{project-name}-maven-jobs'
 
     stream: carbon
     project: 'odlparent'
@@ -97,14 +93,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}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-jobs'
 
     stream: boron
     project: 'odlparent'
@@ -124,6 +123,9 @@
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-sonar
     jobs: