Merge "Migrate infrautils to global-jjb Maven jobs"

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

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index f65d15ebb84c2777ffbf0cc9ee879e5e33e968ae..14096267a27ddebe1a4ea074a02c00320ce1047b 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -1,18 +1,16 @@
 ---
 - project:
-    name: eman-nitrogen
+    name: eman-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'eman'
     project-name: 'eman'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -25,21 +23,21 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
-    name: eman-carbon
+    name: eman-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: carbon
+    stream: nitrogen
     project: 'eman'
     project-name: 'eman'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -52,21 +50,22 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
-    name: eman-boron
+    name: eman-carbon
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: carbon
     project: 'eman'
     project-name: 'eman'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -79,6 +78,9 @@
     email-upstream: '[eman]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: 96e9352979521
+
 - project:
     name: eman-sonar
     jobs: