Merge "Prevent triggering unnecessary genesis jobs when docs change"

diff --combined jjb/genesis/genesis-foreman.yml
index 2c6f06c,e447880..a7fdabf
--- 1/jjb/genesis/genesis-foreman.yml
--- 2/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@@ -90,9 -90,24 +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,13 -161,28 +161,28 @@@
                - 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}/include/**'
+                 forbidden-file-paths:
+                   - compare-type: ANT
+                     pattern: 'common/docs/**'
                    - compare-type: ANT
-                     pattern: '{installer}/**'
+                     pattern: '{installer}/docs/**'
  
      builders:
          - 'foreman-build'
@@@ -599,9 -629,6 +629,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
  

diff --combined jjb/genesis/genesis-fuel.yml
index 3cb71f5,97a6088..405fbc0
--- 1/jjb/genesis/genesis-fuel.yml
--- 2/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@@ -92,9 -92,28 +92,28 @@@
                      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}/deploy/**'
+                   - compare-type: ANT
+                     pattern: '{installer}/include/**'
+                   - compare-type: ANT
+                     pattern: '{installer}/prototypes/**'
+                 forbidden-file-paths:
+                   - compare-type: ANT
+                     pattern: 'common/docs/**'
+                   - compare-type: ANT
+                     pattern: '{installer}/docs/**'
  
      builders:
          - 'fuel-build'
@@@ -149,13 -168,32 +168,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: '{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}/deploy/**'
+                   - compare-type: ANT
+                     pattern: '{installer}/include/**'
+                   - compare-type: ANT
+                     pattern: '{installer}/prototypes/**'
+                 forbidden-file-paths:
+                   - compare-type: ANT
+                     pattern: 'common/docs/**'
+                   - compare-type: ANT
+                     pattern: '{installer}/docs/**'
  
      builders:
          - 'fuel-build'
@@@ -298,10 -336,6 +336,10 @@@
          - 'fuel-upload-artifact'
          - 'fuel-workspace-cleanup'
  
 +    publishers:
 +        - email:
 +            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
 +
  - job-template:
      name: 'genesis-fuel-deploy-{stream}'
  
@@@ -338,10 -372,6 +376,10 @@@
          - 'fuel-download-artifact'
          - 'fuel-deploy'
  
 +    publishers:
 +        - email:
 +            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
 +
  - job-template:
      name: 'genesis-fuel-lab-reconfig-{stream}'
  
@@@ -388,7 -418,7 +426,7 @@@
  
      project-type: freestyle
  
-     disabled: false
+     disabled: true
  
      node: ericsson-build
  
@@@ -509,7 -539,7 +547,7 @@@
              chmod a+x $TMPDIR
  
              # set CONFDIR, BRIDGE
 -            export CONFDIR=$WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/pod2/ha
 +            export CONFDIR=$WORKSPACE/fuel/deploy/templates/hardware_environment/old_conf/linux_foundation_lab/pod2/ha
              export BRIDGE=pxebr
  
              # cleanup first
@@@ -525,8 -555,8 +563,8 @@@
  
              # start the deployment
              echo "Issuing command"
 -            echo "sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso $CONFDIR/dea.yaml $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE"
 -            sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso $CONFDIR/dea.yaml $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE
 +            echo "sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE"
 +            sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE
  
              echo
              echo "--------------------------------------------------------"