X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnic%2Fnic.yaml;h=0af5510cd60367752d30d7f0b128eaf3f251f169;hb=88af8d1cb2b7b7a28d385a041b07a3527e60f134;hp=51f8a18f033a0ca28ba58769af12ca1d833760dd;hpb=b5be33b878d75af8df189ee55974405b9a08dff1;p=releng%2Fbuilder.git

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index 51f8a18f0..0af5510cd 100644
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,19 +1,15 @@
 ---
 - project:
-    name: nic-nitrogen
+    name: nic-oxygen
     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: nitrogen
+    stream: oxygen
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
-    jdk: openjdk8
     jdks:
       - openjdk8
     maven:
@@ -26,48 +22,20 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
-- project:
-    name: nic-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: 'nic'
-    project-name: 'nic'
-    branch: 'stable/carbon'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
-    mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
-    email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
 
 - project:
-    name: nic-boron
+    name: nic-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: 'nic'
     project-name: 'nic'
-    branch: 'stable/boron'
-    jdk: openjdk8
+    branch: 'stable/nitrogen'
     jdks:
       - openjdk8
     maven:
@@ -80,23 +48,22 @@
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
     archive-artifacts: ''
 
+    # Used by the release job
+    staging-profile-id: a67ef386204aa
+
 - project:
-    name: nic-beryllium
+    name: nic-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: 'nic'
     project-name: 'nic'
-    branch: 'stable/beryllium'
-    jdk: openjdk7
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     jdks:
-      - openjdk7
       - openjdk8
     maven:
       - mvn33:
@@ -108,10 +75,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'