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 5f3c5d2ec72de5427772635b417c31b943c5bc0d..959f359e423fe6c479e8f3fe372c3cd94fdb92db 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,8 +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}'
       - '{project-name}-verify-tox-{stream}'
@@ -31,14 +29,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}'
       - '{project-name}-verify-tox-{stream}'
@@ -66,18 +61,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,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'
@@ -125,6 +121,9 @@
     email-upstream: '[odlparent]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 880d5ac25eaa
+
 - project:
     name: odlparent-sonar
     jobs: