Enable daily jobs for fuel and foreman for release

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

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 8522644..6921ab3 100644 (file)
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -47,10 +47,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - foreman-parameters:
-            installer: '{installer}'
         - gerrit-parameter:
             branch: 'master'
+        - foreman-parameter:
+            installer: '{installer}'
 
     scm:
         - gerrit-trigger-scm:
@@ -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
@@ -105,10 +113,10 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - foreman-parameters:
-            installer: '{installer}'
         - gerrit-parameter:
             branch: 'master'
+        - foreman-parameter:
+            installer: '{installer}'
 
     scm:
         - gerrit-trigger-scm:
@@ -140,6 +148,7 @@
 
     builders:
         - 'foreman-build'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-daily-{stream}'
@@ -153,19 +162,17 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - foreman-parameters:
+        - foreman-parameter:
             installer: '{installer}'
 
     scm:
-        - git:
-            skip-tag: true
-            url: $GIT_BASE
-            branches:
-                - $GERRIT_BRANCH
-            refspec: $GERRIT_REFSPEC
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: master
 
-    triggers:
-        - pollscm: '@midnight'
+#   triggers:
+#       - timed: '@midnight'
 
     logrotate:
         daysToKeep: 30
@@ -202,16 +209,14 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - foreman-parameters:
+        - foreman-parameter:
             installer: '{installer}'
 
     scm:
-        - git:
-            skip-tag: true
-            url: $GIT_BASE
-            branches:
-                - $GERRIT_BRANCH
-            refspec: $GERRIT_REFSPEC
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: master
 
     builders:
         - 'foreman-build'
@@ -235,16 +240,18 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - foreman-parameters:
+        - foreman-parameter:
             installer: '{installer}'
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
 
     scm:
-        - git:
-            skip-tag: true
-            url: $GIT_BASE
-            branches:
-                - $GERRIT_BRANCH
-            refspec: $GERRIT_REFSPEC
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: master
 
     builders:
         - 'foreman-deploy'
@@ -253,7 +260,7 @@
 # parameter macros
 ########################
 - parameter:
-    name: foreman-parameters
+    name: foreman-parameter
     parameters:
         - string:
             name: INSTALLER
@@ -271,14 +278,6 @@
             name: GIT_BASE
             default: https://gerrit.opnfv.org/gerrit/$PROJECT
             description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
-        - string:
-            name: GERRIT_BRANCH
-            default: origin/master
-            description: "Branch to build, deploy and test."
-        - string:
-            name: GERRIT_REFSPEC
-            default: refs/heads/master
-            description: "Refspec to retrieve."
         - string:
             name: GS_URL
             default: artifacts.opnfv.org/$PROJECT/$INSTALLER
@@ -377,3 +376,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
+