X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron.yaml;h=b51ce7ad241f2e393528e736886ab23fbdf87ad9;hb=9f80eab4fa3bf05322ca685151148b7a3cf12327;hp=db79a7ff3e5dc9a0960fc1675bcc1cb00f1ad6ae;hpb=2de3d665d597d40eaf1d0601f833c21e57b789e5;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index db79a7ff3..b51ce7ad2 100644
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,93 +1,70 @@
 ---
 - project:
-    name: neutron-oxygen
+    name: neutron-fluorine
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: oxygen
+    stream: fluorine
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
+    build-timeout: 90
     branch: 'master'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-nitrogen
+    name: neutron-oxygen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: nitrogen
+    stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
-    branch: 'stable/nitrogen'
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    build-timeout: 90
+    branch: 'stable/oxygen'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-carbon
+    name: neutron-nitrogen
     jobs:
-      - '{project-name}-clm-{stream}'
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    stream: carbon
+    stream: nitrogen
     project: 'neutron'
     project-name: 'neutron'
     build-timeout: 60
-    branch: 'stable/carbon'
-    karaf-version: karaf3
-    jdk: openjdk8
-    jdks:
-      - openjdk8
-    maven:
-      - mvn33:
-          mvn-version: 'mvn33'
+    branch: 'stable/nitrogen'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
 
 - project:
     name: neutron-sonar
     jobs:
-      - '{project-name}-sonar'
+      - gerrit-maven-sonar
     project: 'neutron'
     project-name: 'neutron'
     branch: 'master'
     mvn-settings: 'neutron-settings'
-    mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'