X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=inline;f=jjb%2Fgenesis%2Fgenesis-foreman.yml;h=a6cc36cfdc1a00fbfd75b3ecbc98d4721612bc20;hb=11a16b0fc149f572d1d9cd886b3ea015e7eadc61;hp=d8abe61568abe5c5ec6824472c69637b63241d71;hpb=605a32598b14c6069b8021ebe2df29d13869e3e5;p=releng.git

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index d8abe6156..a6cc36cfd 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -10,14 +10,14 @@
     installer: 'foreman'
 
     jobs:
-        - 'genesis-foreman-verify-{stream}'
+        - 'genesis-foreman-verify-build-{stream}'
         - 'genesis-foreman-merge-{stream}'
         - 'genesis-foreman-daily-{stream}'
         - 'genesis-foreman-build-{stream}'
         - 'genesis-foreman-deploy-{stream}'
         - 'genesis-foreman-lab-reconfig-{stream}'
         - 'genesis-foreman-deploy-runner-{stream}'
-        - 'genesis-foreman-deploy-virtual-{stream}'
+        - 'genesis-foreman-verify-deploy-virtual-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -33,7 +33,7 @@
 ########################
 
 - job-template:
-    name: 'genesis-foreman-verify-{stream}'
+    name: 'genesis-foreman-verify-build-{stream}'
 
     project-type: freestyle
 
@@ -90,9 +90,24 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
-                    pattern: 'common/**'
+                    pattern: 'common/ci/**'
                   - compare-type: ANT
-                    pattern: '{installer}/**'
+                    pattern: 'common/manifests/**'
+                  - compare-type: ANT
+                    pattern: 'common/puppet-opnfv/**'
+                  - compare-type: ANT
+                    pattern: 'common/tools/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/build/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/ci/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/include/**'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'common/docs/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/docs/**'
 
     builders:
         - 'foreman-build'
@@ -146,17 +161,32 @@
               - project-compare-type: 'ANT'
                 project-pattern: 'genesis'
                 branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
-                    pattern: 'common/**'
+                    pattern: 'common/ci/**'
+                  - compare-type: ANT
+                    pattern: 'common/manifests/**'
+                  - compare-type: ANT
+                    pattern: 'common/puppet-opnfv/**'
+                  - compare-type: ANT
+                    pattern: 'common/tools/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/build/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/ci/**'
                   - compare-type: ANT
-                    pattern: '{installer}/**'
+                    pattern: '{installer}/include/**'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'common/docs/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/docs/**'
 
     builders:
         - 'foreman-build'
-        - 'fuel-workspace-cleanup'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-daily-{stream}'
@@ -203,11 +233,19 @@
             git-revision: true
             block: true
         - trigger-builds:
-          - project: 'functest-opnfv-jump-2'
-            block: true
-        - trigger-builds:
-          - project: 'yardstick-opnfv-jump-2'
+          - project: 'functest-foreman-{stream}'
             block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        # - trigger-builds:
+          # - project: 'yardstick-foreman-{stream}'
+            # block: true
+            # block-thresholds:
+                # build-step-failure-threshold: 'never'
+                # failure-threshold: 'never'
+                # unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'genesis-foreman-deploy-runner-{stream}'
@@ -284,7 +322,7 @@
     builders:
         - 'foreman-build'
         - 'foreman-upload-artifact'
-        - 'fuel-workspace-cleanup'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-deploy-{stream}'
@@ -363,7 +401,7 @@
         - 'foreman-lab-reconfig'
 
 - job-template:
-    name: 'genesis-foreman-deploy-virtual-{stream}'
+    name: 'genesis-foreman-verify-deploy-virtual-{stream}'
 
     project-type: freestyle
 
@@ -417,10 +455,25 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
-                    pattern: 'common/**'
+                    pattern: 'common/ci/**'
+                  - compare-type: ANT
+                    pattern: 'common/manifests/**'
                   - compare-type: ANT
-                    pattern: '{installer}/**'
-            dependency-jobs: 'genesis-foreman-verify-{stream}'
+                    pattern: 'common/puppet-opnfv/**'
+                  - compare-type: ANT
+                    pattern: 'common/tools/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/build/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/ci/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/include/**'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'common/docs/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/docs/**'
+            dependency-jobs: 'genesis-foreman-verify-build-{stream}'
 
 
     builders:
@@ -519,8 +572,8 @@
             done
 
             if [ "$ping_flag" -eq 1 ]; then
-              echo "Slave is pingable, now wait 90 seconds for services to start"
-              sleep 90
+              echo "Slave is pingable, now wait 180 seconds for services to start"
+              sleep 180
             else
               echo "Slave did not come back up after reboot: please check opnfv-jump-2"
               exit 1
@@ -591,6 +644,9 @@
             # cleanup first
             sudo $WORKSPACE/common/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml
 
+            echo "Sleeping for 60 seconds between clean and deploy to allow nodes to power off"
+            sleep 60
+
             # and then initiate deployment
             sudo $WORKSPACE/$INSTALLER/ci/deploy.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml
 
@@ -667,9 +723,9 @@
 - trigger:
     name: 'foreman-master'
     triggers:
-        - pollscm: '0 21 * * *'
+        - timed: '0 11 * * *'
 
 - trigger:
     name: 'foreman-stable-arno'
     triggers:
-        - pollscm: '0 1 * * *'
+        - timed: '0 17 * * *'