Enable deployment and functest on POD2

[releng.git] / jjb / genesis / genesis-foreman.yml

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 5fd1135..00229e6 100644 (file)
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -88,6 +88,7 @@
 
     builders:
         - 'foreman-build'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-merge'
@@ -96,6 +97,13 @@
 
     node: ericsson-build
 
+    concurrent: true
+
+    properties:
+        - throttle:
+            enabled: true
+            max-total: 2
+
     logrotate:
         daysToKeep: 30
         numToKeep: 40
@@ -140,13 +148,14 @@
 
     builders:
         - 'foreman-build'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-daily-{stream}'
 
     project-type: freestyle
 
-    node: ericsson-build
+    node: gce-opnfv-docker-1
 
     disabled: false
 
@@ -163,7 +172,7 @@
             branch: master
 
     triggers:
-        - timed: '@midnight'
+        - timed: 'H */6 * * *'
 
     logrotate:
         daysToKeep: 30
@@ -172,10 +181,6 @@
         artifactNumToKeep: -1
 
     builders:
-        - trigger-builds:
-          - project: 'genesis-foreman-build'
-            git-revision: true
-            block: true
         - trigger-builds:
           - project: 'genesis-foreman-deploy'
             git-revision: true
@@ -363,3 +368,16 @@
             echo
             echo "--------------------------------------------------------"
             echo "Done!"
+
+- builder:
+    name: 'foreman-workspace-cleanup'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -o errexit
+            set -o nounset
+            set -o pipefail
+
+            # delete everything that is in $WORKSPACE
+            /bin/rm -rf $WORKSPACE
+