X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnemo%2Fnemo.yaml;h=0874bb36dd651fbb0996ac4f01dca4d396cc8a10;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=5c28e9ae9989e014c4009c697efa483dda66ebc2;hpb=564ea6891db06cb85c10a008ea240056ce2610b0;p=releng%2Fbuilder.git

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 5c28e9ae9..0874bb36d 100644
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: nemo-nitrogen
+    name: nemo-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}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'nemo'
     project-name: 'nemo'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,51 +23,21 @@
     email-upstream: '[nemo]'
     archive-artifacts: ''
 
-- project:
-    name: nemo-carbon
-    jobs:
-      - '{project-name}-clm-{stream}'
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution4-check-carbon'
-      - '{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}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: boron
+    stream: nitrogen
     project: 'nemo'
     project-name: 'nemo'
-    branch: 'stable/boron'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -83,24 +50,23 @@
     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}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-validate-autorelease-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    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:
@@ -112,10 +78,13 @@
     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'