Put workspace cleanup back for genesis/fuel and genesis/foreman

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

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 260e98a..656b443 100644 (file)
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -12,18 +12,19 @@
     jobs:
         - 'genesis-foreman-verify-{stream}'
         - 'genesis-foreman-merge'
-        - 'genesis-foreman-daily-master'
-        - 'genesis-foreman-build'
-        - 'genesis-foreman-deploy'
+        - 'genesis-foreman-daily-{stream}'
+        - 'genesis-foreman-build-{stream}'
+        - 'genesis-foreman-deploy-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
     stream:
         - master:
             branch: 'master'
+            gs-pathname: ''
         - stable-arno:
             branch: 'stable/arno'
-
+            gs-pathname: '/arno'
 ########################
 # job templates
 ########################
@@ -55,7 +56,7 @@
             branch: '{branch}'
         - foreman-parameter:
             installer: '{installer}'
-
+            gs-pathname: '{gs-pathname}'
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -121,7 +122,7 @@
             branch: 'master'
         - foreman-parameter:
             installer: '{installer}'
-
+            gs-pathname: ''
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
@@ -152,10 +153,10 @@
 
     builders:
         - 'foreman-build'
-        - 'foreman-workspace-cleanup'
+        - 'fuel-workspace-cleanup'
 
 - job-template:
-    name: 'genesis-foreman-daily-master'
+    name: 'genesis-foreman-daily-{stream}'
 
     project-type: freestyle
 
@@ -163,17 +164,20 @@
 
     disabled: false
 
+    triggers:
+        - 'foreman-{stream}'
+
     parameters:
         - project-parameter:
             project: '{project}'
         - foreman-parameter:
             installer: '{installer}'
-
+            gs-pathname: '{gs-pathname}'
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     logrotate:
         daysToKeep: 30
@@ -183,19 +187,22 @@
 
     builders:
         - trigger-builds:
-          - project: 'genesis-foreman-build'
+          - project: 'genesis-foreman-build-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'genesis-foreman-deploy'
+          - project: 'genesis-foreman-deploy-{stream}'
             git-revision: true
             block: true
         - trigger-builds:
           - project: 'functest-opnfv-jump-2'
             block: true
+        - trigger-builds:
+          - project: 'yardstick-opnfv-jump-2'
+            block: true
 
 - job-template:
-    name: 'genesis-foreman-build'
+    name: 'genesis-foreman-build-{stream}'
 
     project-type: freestyle
 
@@ -212,19 +219,20 @@
             project: '{project}'
         - foreman-parameter:
             installer: '{installer}'
-
+            gs-pathname: '{gs-pathname}'
     scm:
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     builders:
         - 'foreman-build'
         - 'foreman-upload-artifact'
+        - 'fuel-workspace-cleanup'
 
 - job-template:
-    name: 'genesis-foreman-deploy'
+    name: 'genesis-foreman-deploy-{stream}'
 
     project-type: freestyle
 
@@ -243,6 +251,7 @@
             project: '{project}'
         - foreman-parameter:
             installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
         - string:
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
@@ -252,7 +261,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
+            branch: '{branch}'
 
     builders:
         - 'foreman-deploy'
@@ -273,7 +282,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
         - string:
             name: CACHE_DIRECTORY
-            default: $HOME/opnfv/cache/genesis-$INSTALLER
+            default: $HOME/opnfv/cache/genesis-$INSTALLER{gs-pathname}
             description: "Directory where the cache to be used during the build is located."
         - string:
             name: GIT_BASE
@@ -281,7 +290,7 @@
             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: GS_URL
-            default: artifacts.opnfv.org/$PROJECT/$INSTALLER
+            default: artifacts.opnfv.org/$PROJECT/$INSTALLER{gs-pathname}
             description: "URL to Google Storage."
 
 ########################
@@ -377,6 +386,7 @@
             echo
             echo "--------------------------------------------------------"
             echo "Done!"
+            echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso"
 
 - builder:
     name: 'foreman-workspace-cleanup'
@@ -390,3 +400,15 @@
             # delete everything that is in $WORKSPACE
             /bin/rm -rf $WORKSPACE
 
+########################
+# trigger macros
+########################
+- trigger:
+    name: 'foreman-master'
+    triggers:
+        - pollscm: '0 21 * * *'
+
+- trigger:
+    name: 'foreman-stable-arno'
+    triggers:
+        - pollscm: '0 3 * * *'