Merge "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 0c40a66521f55881d885bb593e0e35727578a0b2..f54557e262e5554515b2f0b9d0badff7f50ec633 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,12 +2,15 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-ci-jobs'
-      - '{project-name}-verify-tox-{stream}'
-      - 'builder-check-poms'
+      - '{project-name}-ci-jobs':
+          build-node: centos7-builder-2c-2g
+      - builder-check-poms
+      - builder-copy-sandbox-logs
+      - gerrit-tox-verify
       # OpenStack Related
-      - 'builder-verify-image-visibility'
+      - '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,9 +22,10 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-java-builder-2c-4g
+    build-node: centos7-builder-2c-1g
     archive-artifacts: '**/*.log'
-    build-timeout: 10
+    build-timeout: 30
+    jjb-version: 2.0.0
 
 - project:
     name: packer-jobs
@@ -32,6 +36,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
+    build-node: centos7-builder-2c-1g
 
     platforms:
       - centos
@@ -43,31 +48,22 @@
       - 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
       - 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
         templates: gbp
-      - platforms: centos
-        templates: mininet
       - platforms: centos
         templates: mininet-ovs-2.5
-      - platforms: ubuntu-14.04
-        templates: java-builder
-      - platforms: ubuntu-14.04
-        templates: robot
+      - platforms: centos
+        templates: mininet-ovs-2.6
       - platforms: ubuntu-14.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-14.04
@@ -76,34 +72,22 @@
         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-16.04
-        templates: java-builder
-      - platforms: ubuntu-16.04
-        templates: robot
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.6
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-ocata
       - platforms: ubuntu-16.04
-        templates: devstack
-      - platforms: ubuntu-16.04
-        templates: docker
-      - platforms: ubuntu-16.04
-        templates: mininet
-      - platforms: ubuntu-16.04
-        templates: gbp
+        templates: devstack-pre-pip-pike
       - platforms: ubuntu-16.04
-        templates: baseline
-      - platforms: centos
-        templates: baseline
+        templates: devstack
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-1g
 
     project-type: freestyle
 
@@ -135,13 +119,52 @@
           email-prefix: '[releng]'
       - lf-infra-publish
 
-
 - job-template:
-    name: 'builder-verify-image-visibility'
+    name: builder-copy-sandbox-logs
+    node: centos7-builder-2c-1g
+
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
 
-    os-cloud: 'odlpriv-sandbox'
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 1
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: ''
+          project: ''
+          branch: ''
+          refspec: ''
+          artifacts: ''
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: 10
+
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'copy-logs:'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**'
+
+    builders:
+      - shell: !include-raw-escape: copy-sandbox-logs.sh
+
+    publishers:
+      - lf-infra-publish
+
+
+- job-template:
+    name: 'builder-verify-image-protection'
+    project-type: freestyle
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -165,16 +188,15 @@
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
-            - file-id: opendaylight-private-clouds-yaml
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
-      # Check images visibility on a daily schedule
       - timed: '@daily'
 
     builders:
       - shell: !include-raw-escape:
-          - opendaylight-infra-check-image-visibility.sh
+          - opendaylight-infra-check-image-protection.sh
 
     publishers:
       - email-notification:
@@ -186,7 +208,7 @@
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -210,7 +232,7 @@
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
-            - file-id: opendaylight-private-clouds-yaml
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers:
@@ -229,10 +251,49 @@
       - lf-infra-publish
 
 
+- job-template:
+    name: builder-delete-orphaned-nodes
+    project-type: freestyle
+    node: centos7-builder-2c-1g
+
+    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-2c-4g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -269,7 +330,7 @@
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -282,6 +343,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:
@@ -304,7 +369,7 @@
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -312,7 +377,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: odlpriv
+          os-cloud: vex
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -328,7 +393,7 @@
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
-            - file-id: opendaylight-private-clouds-yaml
+            - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
 
     triggers: