X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnemo%2Fnemo.yaml;h=87b339e40f132164885f69b22984a0a182feda55;hb=dac658c4a6587a4b299b18df0e2c558371722167;hp=d39b71b0f19bf04f3503af474e9c46b7724c043b;hpb=e4d04440ba14634e48b5a806d1c4273ff8c8edb1;p=releng%2Fbuilder.git

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index d39b71b0f..87b339e40 100644
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,124 +1,86 @@
 ---
 - project:
-    name: nemo-nitrogen
+    name: nemo-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
-- project:
-    name: nemo-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}'
-
-    stream: carbon
-    project: 'nemo'
-    project-name: 'nemo'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: ''
-    email-upstream: '[nemo]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
 
 - project:
-    name: nemo-boron
+    name: nemo-nitrogen
     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}'
+      - odl-maven-jobs
 
-    stream: boron
+    stream: nitrogen
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
-    name: nemo-beryllium
+    name: nemo-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}'
+      - odl-maven-jobs
 
-    stream: beryllium
+    stream: carbon
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/beryllium'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk7
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67a9890f6202
+
 - project:
     name: nemo-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
     mvn-settings: 'nemo-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'