X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-jobs.yaml;h=f9cf715e65257a78f24ad2f7a73ac5e7394c4282;hb=319f285bde711807ff800a042a9eeeb908291329;hp=e0c6f5a3257b5c40e084d07bf3e2d36b3a8603b6;hpb=4d4adf6267c2090203f92ab2c02235f962b8f095;p=releng%2Fbuilder.git

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index e0c6f5a32..f9cf715e6 100644
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -3,11 +3,12 @@
     name: builder-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project-name}-verify-tox-{stream}'
-      - 'builder-check-poms'
+      - builder-check-poms
+      - 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 +20,9 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-java-builder-2c-4g
+    build-node: centos7-java-builder-2c-8g
     archive-artifacts: '**/*.log'
-    build-timeout: 10
+    build-timeout: 30
 
 - project:
     name: packer-jobs
@@ -32,6 +33,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
+    build-node: centos7-java-builder-2c-8g
 
     platforms:
       - centos
@@ -101,8 +103,6 @@
         templates: docker
       - platforms: ubuntu-16.04
         templates: mininet
-      - platforms: ubuntu-16.04
-        templates: gbp
       - platforms: ubuntu-16.04
         templates: baseline
       - platforms: centos
@@ -110,7 +110,7 @@
 
 - job-template:
     name: builder-check-poms
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-2c-8g
 
     project-type: freestyle
 
@@ -144,11 +144,9 @@
 
 
 - job-template:
-    name: 'builder-verify-image-visibility'
+    name: 'builder-verify-image-protection'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
-
-    os-cloud: 'odlpriv-sandbox'
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -172,16 +170,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:
@@ -193,7 +190,7 @@
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -217,7 +214,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:
@@ -236,10 +233,45 @@
       - lf-infra-publish
 
 
+- job-template:
+    name: builder-delete-orphaned-nodes
+    project-type: freestyle
+    node: centos7-java-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}'
+
+    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-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -276,7 +308,7 @@
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -311,7 +343,7 @@
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-java-builder-2c-4g
+    node: centos7-java-builder-2c-8g
 
     properties:
       - opendaylight-infra-properties:
@@ -319,7 +351,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
-          os-cloud: odlpriv
+          os-cloud: vex
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -335,7 +367,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: