X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fneutron%2Fneutron.yaml;h=766bd81c7ce2459e277a6572619e1253efb89013;hb=b9d1c441d944b2edf2fcedc36abbcd3718119ed4;hp=59b8c8aea53049f21bbd68f30cdd66cfc0c3b210;hpb=b00f60677e7f94241a091cf6935970e5b9cf8ed3;p=releng%2Fbuilder.git

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 59b8c8aea..766bd81c7 100644
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -1,110 +1,91 @@
+---
 - project:
-    name: neutron-carbon
+    name: neutron-fluorine
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - carbon:
-            disable_autorelease: False
-            disable_distribution_check: False
+    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-oxygen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: oxygen
+    project: 'neutron'
+    project-name: 'neutron'
+    build-timeout: 90
+    branch: 'stable/oxygen'
+    mvn-settings: 'neutron-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
+    email-upstream: '[neutron] [odlparent] [aaa]'
+
+    # Used by the release job
+    staging-profile-id: a67e1b40d7419
 
 - project:
-    name: neutron-boron
+    name: neutron-nitrogen
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
 
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            disable_autorelease: False
-            disable_distribution_check: False
+    stream: nitrogen
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/boron'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+    build-timeout: 60
+    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-beryllium
+    name: neutron-carbon
     jobs:
-        - '{project-name}-clm-{stream}'
-        - '{project-name}-distribution-{stream}'
-        - '{project-name}-distribution-check-{stream}'
-        - '{project-name}-integration-{stream}'
-        - '{project-name}-merge-{stream}'
-        - '{project-name}-periodic-{stream}'
-        - '{project-name}-validate-autorelease-{stream}'
-        - '{project-name}-verify-{stream}-{maven}-{jdks}'
-    stream:
-        - beryllium:
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - odl-maven-jobs
+
+    stream: carbon
     project: 'neutron'
     project-name: 'neutron'
-    branch: 'stable/beryllium'
-    jdk: openjdk8
-    jdks:
-        - openjdk8
-    maven:
-        - mvn33:
-            mvn-version: '{mvn33}'
+    build-timeout: 60
+    branch: 'stable/carbon'
+    karaf-version: karaf3
     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'