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 ebfaf09400675c99a63ae9517e58c6340b1f7c23..d3597a20c560b6ea80de52f17fa6aa6eb4aa8d79 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -8,6 +8,7 @@
       # OpenStack Related
       - 'builder-verify-image-protection'
       - 'builder-cleanup-old-images'
+      - 'builder-delete-orphaned-nodes'
       - 'builder-delete-stale-nodes'
       - 'builder-delete-stale-stacks'
       # Automation for docs and jobs
@@ -19,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
 
@@ -32,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
@@ -44,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
@@ -68,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
@@ -80,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
@@ -98,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
@@ -109,7 +93,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-1c-4g
+    node: centos7-builder-2c-8g
 
     project-type: freestyle
 
@@ -145,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:
@@ -189,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:
@@ -232,10 +216,49 @@
       - lf-infra-publish
 
 
+- job-template:
+    name: builder-delete-orphaned-nodes
+    project-type: freestyle
+    node: centos7-builder-2c-8g
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 7
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          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:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      # Attempt to clear up servers every 30 mins in case we have orphaned servers
+      - timed: '0,30 * * * *'
+
+    builders:
+      - shell: !include-raw-escape: opendaylight-infra-cleanup-orphaned-nodes.sh
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[releng]'
+      - lf-infra-publish
+
+
 - 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:
@@ -272,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:
@@ -285,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:
@@ -307,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:
@@ -315,7 +342,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: odlpriv
+          os-cloud: vex
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'