X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnic%2Fnic.yaml;h=593f72cb917b4d51ce1a7754516c6fe4030d9322;hb=ebb321f1aaa399dc574f0174541d6baed8af97cf;hp=c2792e790271372d725394f6020095d32f0dd328;hpb=0ae43130911df606dca3a46b7bc94a37f4c836ee;p=releng%2Fbuilder.git

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index c2792e7902..593f72cb91 100644
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,19 +1,16 @@
 ---
 - project:
-    name: nic-nitrogen
+    name: nic-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-distribution3-check-nitrogen'
       - '{project-name}-integration-{stream}'
+      - '{project-name}-maven-jobs'
       - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
 
-    stream: nitrogen
+    stream: oxygen
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,22 +23,21 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
-    name: nic-carbon
+    name: nic-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: carbon
+    stream: nitrogen
     project: 'nic'
     project-name: 'nic'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -54,22 +50,22 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
-    name: nic-boron
+    name: nic-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: boron
+    stream: carbon
     project: 'nic'
     project-name: 'nic'
-    branch: 'stable/boron'
+    branch: 'stable/carbon'
     karaf-version: karaf3
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -82,10 +78,13 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
     name: nic-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'nic'
     project-name: 'nic'
     branch: 'master'