X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fnic%2Fnic.yaml;h=c11083876675c300a4b5bb5fa8ab980d59452682;hb=b4cf45c2f7b0f81a395a81f85718df294868429d;hp=b4aa09aabc2a6ccec9204e3d81fde0dc3ee20c58;hpb=482eb559cce738749ed152a72bd28b279e4c7edf;p=releng%2Fbuilder.git

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index b4aa09aab..c11083876 100644
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -1,82 +1,37 @@
 ---
 - project:
-    name: nic-oxygen
+    name: nic-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
-    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-nitrogen
-    jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
-
-    stream: nitrogen
-    project: 'nic'
-    project-name: 'nic'
-    branch: 'stable/nitrogen'
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-node: centos7-builder-2c-8g
     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-carbon
+    name: nic-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: oxygen
     project: 'nic'
     project-name: 'nic'
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/oxygen'
+    build-node: centos7-builder-2c-8g
     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
@@ -84,10 +39,16 @@
 - project:
     name: nic-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- view:
+    name: nic
+    description: 'List of nic jobs'
+    regex: '^nic-.*'
+    <<: *releng_view_common