X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fgenesis%2Fgenesis-foreman.yml;h=808dd3b22bbbd7d2a6a641933c036702c8c0a6e3;hb=71e92404b9e6fdb266f688469cfcc87dd7df0612;hp=77660c2adcf870413668b7436f57f1126846eefd;hpb=762eeb731dbc3c774d042cfccae3008a2ea269da;p=releng.git

diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml
index 77660c2ad..808dd3b22 100644
--- a/jjb/genesis/genesis-foreman.yml
+++ b/jjb/genesis/genesis-foreman.yml
@@ -9,15 +9,15 @@
 
     installer: 'foreman'
 
-    jobs:
-        - 'genesis-foreman-verify-{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}'
+#    jobs:
+#        - '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-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,24 +82,36 @@
                     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}/**'
+                    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'
         - 'foreman-workspace-cleanup'
-        - trigger-builds:
-          - project: 'genesis-foreman-deploy-virtual-{stream}'
-            git-revision: true
 
 - job-template:
     name: 'genesis-foreman-merge-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -115,12 +119,6 @@
             enabled: true
             max-total: 2
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -135,10 +133,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -149,23 +143,36 @@
               - 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}/**'
+                    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'
-        - 'fuel-workspace-cleanup'
+        - 'foreman-workspace-cleanup'
 
 - job-template:
     name: 'genesis-foreman-daily-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     disabled: true
@@ -186,12 +193,6 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'genesis-foreman-build-{stream}'
@@ -206,26 +207,29 @@
             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'
+
+    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:
@@ -262,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:
@@ -287,23 +285,15 @@
     builders:
         - 'foreman-build'
         - 'foreman-upload-artifact'
-        - 'fuel-workspace-cleanup'
+        - 'foreman-workspace-cleanup'
 
 - 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}'
@@ -327,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:
@@ -366,23 +346,17 @@
         - 'foreman-lab-reconfig'
 
 - job-template:
-    name: 'genesis-foreman-deploy-virtual-{stream}'
-
-    project-type: freestyle
-
-    disabled: false
+    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:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
         - foreman-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
@@ -390,12 +364,51 @@
             name: GIT_BASE
             default: ssh://gerrit.opnfv.org:29418/$PROJECT
             description: "Used for overriding the GIT URL coming from parameters macro."
-
     scm:
-        - git-scm:
+        - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
+
+    triggers:
+        - gerrit:
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: 'false'
+                    exclude-trivial-rebase: 'false'
+                    exclude-no-code-change: 'false'
+                - draft-published-event
+                - comment-added-contains-event:
+                    comment-contains-value: 'recheck'
+                - comment-added-contains-event:
+                    comment-contains-value: 'reverify'
+            projects:
+              - project-compare-type: 'ANT'
+                project-pattern: 'genesis'
+                branches:
+                  - branch-compare-type: 'ANT'
+                    branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    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}/docs/**'
+            dependency-jobs: 'genesis-foreman-verify-build-{stream}'
 
     builders:
         - 'foreman-deploy-virtual'
@@ -493,8 +506,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
@@ -565,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
 
@@ -641,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 * * *'