Merge "Increase ocata packer timeout from 60m to 75m"

[releng/builder.git] / jjb / neutron / neutron.yaml

diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml
index 6e421f2f611fb41da6897892a05a2853c484bd39..3f3de316aeb5e33e23946ae2411fe65dda34206f 100644 (file)
--- a/jjb/neutron/neutron.yaml
+++ b/jjb/neutron/neutron.yaml
@@ -4,14 +4,13 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'neutron'
     project-name: 'neutron'
-    build-timeout: 60
+    build-timeout: 90
     branch: 'master'
     jdks:
       - openjdk8
@@ -33,9 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'neutron'
@@ -62,9 +60,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'neutron'