Increase ocata packer timeout from 60m to 75m

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 7dae8f73723f26c154b12b711b6b60a0aa5bd27f..d3597a20c560b6ea80de52f17fa6aa6eb4aa8d79 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -20,7 +20,7 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-builder-2c-8g
     archive-artifacts: '**/*.log'
     build-timeout: 30
 
@@ -33,7 +33,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
-    build-node: centos7-java-builder-1c-4g
+    build-node: centos7-builder-2c-8g
 
     platforms:
       - centos
@@ -45,20 +45,15 @@
       - devstack-pre-pip-newton:
           build-timeout: 75
       - devstack-pre-pip-ocata:
-          build-timeout: 60
+          build-timeout: 75
       - devstack-pre-pip-pike:
           build-timeout: 75
-      - docker:
-          build-timeout: 60
       - gbp
-      - java-builder:
-          build-timeout: 75
       - mininet
       - mininet-ovs-2.5:
           build-timeout: 60
       - mininet-ovs-2.6:
           build-timeout: 75
-      - robot
 
     exclude:
       - platforms: centos
@@ -69,10 +64,6 @@
         templates: mininet-ovs-2.5
       - platforms: centos
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-14.04
-        templates: java-builder
-      - platforms: ubuntu-14.04
-        templates: robot
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-14.04
@@ -81,16 +72,10 @@
         templates: devstack-pre-pip-pike
       - platforms: ubuntu-14.04
         templates: devstack
-      - platforms: ubuntu-14.04
-        templates: docker
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.5
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.6
-      - platforms: ubuntu-16.04
-        templates: java-builder
-      - platforms: ubuntu-16.04
-        templates: robot
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04
@@ -99,8 +84,6 @@
         templates: devstack-pre-pip-pike
       - platforms: ubuntu-16.04
         templates: devstack
-      - platforms: ubuntu-16.04
-        templates: docker
       - platforms: ubuntu-16.04
         templates: mininet
       - platforms: ubuntu-16.04
@@ -110,7 +93,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -146,7 +129,7 @@
 - job-template:
     name: 'builder-verify-image-protection'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -190,7 +173,7 @@
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -236,7 +219,7 @@
 - job-template:
     name: builder-delete-orphaned-nodes
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -249,6 +232,10 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - string:
+          name: JENKINS_URLS
+          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
+          description: 'Space separated list of Jenkins URLs to check for active builds'
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -271,7 +258,7 @@
 - job-template:
     name: 'builder-delete-stale-nodes'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -308,7 +295,7 @@
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -321,6 +308,10 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - string:
+          name: JENKINS_URLS
+          default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox'
+          description: 'Space separated list of Jenkins URLs to check for active builds'
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -343,7 +334,7 @@
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties: