X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fgenesis%2Fgenesis-foreman.yml;h=9c212ace1396fdac82c8ad21ecb6fac4ed4d99a4;hb=873d222ce9eb486b178d29c12ccbc7a856ac2233;hp=26f0a40355fab30ef2f1cf0fbf82bb92deeee012;hpb=f7d774bd45cab36eefab7baf6180f84ed4296a6e;p=releng.git

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 26f0a4035..9c212ace1 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)
@@ -25,17 +25,19 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            disabled: true
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
+            disabled: true
 ########################
 # job templates
 ########################
 
 - job-template:
-    name: 'genesis-foreman-verify-{stream}'
+    name: 'genesis-foreman-verify-build-{stream}'
 
-    project-type: freestyle
+    disabled: true
 
     node: ericsson-build
 
@@ -46,12 +48,6 @@
             enabled: true
             max-total: 1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -66,10 +62,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -90,9 +82,24 @@
                     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'
@@ -101,10 +108,10 @@
 - job-template:
     name: 'genesis-foreman-merge-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -112,12 +119,6 @@
             enabled: true
             max-total: 2
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -132,10 +133,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -146,13 +143,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}/**'
+                    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'
@@ -161,11 +173,9 @@
 - job-template:
     name: 'genesis-foreman-daily-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
-    disabled: false
+    disabled: true
 
     triggers:
         - 'foreman-{stream}'
@@ -183,12 +193,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'genesis-foreman-build-{stream}'
@@ -209,28 +213,23 @@
                 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'
+        # - trigger-builds:
+          # - project: 'yardstick-foreman-{stream}'
+            # block: true
+            # block-thresholds:
+                # build-step-failure-threshold: 'never'
+                # failure-threshold: 'never'
+                # unstable-threshold: 'FAILURE'
+
+    publishers:
+        - trigger-parameterized-builds:
+            - project: 'genesis-fuel-daily-{stream}'
+              trigger-with-no-params: true
 
 - job-template:
     name: 'genesis-foreman-deploy-runner-{stream}'
 
-    project-type: freestyle
-
-    disabled: false
-
-    node: master
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
@@ -267,15 +266,9 @@
 - job-template:
     name: 'genesis-foreman-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
@@ -297,18 +290,10 @@
 - job-template:
     name: 'genesis-foreman-deploy-{stream}'
 
-    project-type: freestyle
-
-    disabled: false
+    disabled: true
 
     node: opnfv-jump-2
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -332,17 +317,7 @@
 - job-template:
     name: 'genesis-foreman-lab-reconfig-{stream}'
 
-    project-type: freestyle
-
-    disabled: false
-
-    node: master
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
@@ -371,17 +346,11 @@
         - 'foreman-lab-reconfig'
 
 - job-template:
-    name: 'genesis-foreman-deploy-virtual-{stream}'
-
-    project-type: freestyle
+    name: 'genesis-foreman-verify-deploy-virtual-{stream}'
 
     node: opnfv-jump-1
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
@@ -401,10 +370,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -425,11 +390,25 @@
                     branch-pattern: '**/{branch}'
                 file-paths:
                   - compare-type: ANT
-                    pattern: 'common/**'
+                    pattern: 'common/ci/**'
                   - compare-type: ANT
-                    pattern: '{installer}/**'
-            dependency-jobs: 'genesis-foreman-verify-{stream}'
-
+                    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/**'
+            dependency-jobs: 'genesis-foreman-verify-build-{stream}'
 
     builders:
         - 'foreman-deploy-virtual'
@@ -599,6 +578,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
 
@@ -675,9 +657,9 @@
 - trigger:
     name: 'foreman-master'
     triggers:
-        - pollscm: '0 21 * * *'
+        - timed: '0 11 * * *'
 
 - trigger:
     name: 'foreman-stable-arno'
     triggers:
-        - pollscm: '0 1 * * *'
+        - timed: '0 12 * * *'