X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fgenesis%2Fgenesis-fuel.yml;h=cc134fb101c72068ba6a0386fe4468222c066af0;hb=c2e2b44e6f1a72658b0dcdb6cf03b737096565a0;hp=c050adcdf6feff9b944a28745de924f1c8933038;hpb=47a75bdf35e2203f7a69013c803d54e52e4b6c80;p=releng.git

diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml
index c050adcdf..cc134fb10 100644
--- a/jjb/genesis/genesis-fuel.yml
+++ b/jjb/genesis/genesis-fuel.yml
@@ -9,14 +9,15 @@
 
     installer: 'fuel'
 
-    jobs:
-        - 'genesis-fuel-verify-{stream}'
-        - 'genesis-fuel-merge-{stream}'
-        - 'genesis-fuel-daily-{stream}'
-        - 'genesis-fuel-build-{stream}'
-        - 'genesis-fuel-deploy-{stream}'
-        - 'genesis-fuel-deploy-virtual-master'
-        - 'genesis-fuel-deploy-runner-{stream}'
+#    jobs:
+#        - 'genesis-fuel-verify-build-{stream}'
+#        - 'genesis-fuel-merge-{stream}'
+#        - 'genesis-fuel-daily-{stream}'
+#        - 'genesis-fuel-build-{stream}'
+#        - 'genesis-fuel-deploy-{stream}'
+#        - 'genesis-fuel-deploy-runner-{stream}'
+#        - 'genesis-fuel-lab-reconfig-{stream}'
+#        - 'genesis-fuel-verify-deploy-virtual-{stream}'
 
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
@@ -24,21 +25,23 @@
         - master:
             branch: 'master'
             gs-pathname: ''
+            disabled: true
         - stable-arno:
             branch: 'stable/arno'
             gs-pathname: '/arno'
+            disabled: true
 
 ########################
 # job templates
 ########################
 
 - job-template:
-    name: 'genesis-fuel-verify-{stream}'
-
-    project-type: freestyle
+    name: 'genesis-fuel-verify-build-{stream}'
 
     node: ericsson-build
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -46,18 +49,12 @@
             enabled: true
             max-total: 3
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -67,10 +64,6 @@
             refspec: '$GERRIT_REFSPEC'
             choosing-strategy: 'gerrit'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -91,9 +84,28 @@
                     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}/deploy/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/include/**'
                   - compare-type: ANT
-                    pattern: '{installer}/**'
+                    pattern: '{installer}/prototypes/**'
+                forbidden-file-paths:
+                  - compare-type: ANT
+                    pattern: 'common/docs/**'
+                  - compare-type: ANT
+                    pattern: '{installer}/docs/**'
 
     builders:
         - 'fuel-build'
@@ -102,10 +114,10 @@
 - job-template:
     name: 'genesis-fuel-merge-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
+    disabled: true
+
     concurrent: true
 
     properties:
@@ -113,18 +125,12 @@
             enabled: true
             max-total: 2
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
-
     parameters:
         - project-parameter:
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -134,10 +140,6 @@
             refspec: ''
             choosing-strategy: 'default'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -148,13 +150,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}/**'
+                    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'
@@ -163,19 +184,17 @@
 - job-template:
     name: 'genesis-fuel-daily-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
-    disabled: false
+    disabled: true
 
     triggers:
-        - 'fuel-{stream}'
+        - 'genesis-fuel-{stream}-trigger'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -185,45 +204,87 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - trigger-builds:
           - project: 'genesis-fuel-build-{stream}'
             git-revision: true
             block: true
-#        - trigger-builds:
-#          - project: 'genesis-fuel-deploy-runner-{stream}'
-#            git-revision: true
-#            block: true
-#        - trigger-builds:
-#          - project: 'functest-opnfv-jump-1'
-#            block: true
-#        - trigger-builds:
-#          - project: 'yardstick-opnfv-jump-1'
-#            block: true
+        - trigger-builds:
+          - project: 'genesis-fuel-lab-reconfig-{stream}'
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'genesis-fuel-deploy-{stream}'
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'functest-fuel-{stream}'
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        # - trigger-builds:
+          # - project: 'yardstick-fuel-{stream}'
+            # block: true
+            # block-thresholds:
+                # build-step-failure-threshold: 'never'
+                # failure-threshold: 'never'
+                # unstable-threshold: 'FAILURE'
+
+    publishers:
+        - trigger-parameterized-builds:
+            - project: 'genesis-foreman-daily-{stream}'
+              trigger-with-no-params: true
 
 - job-template:
-    name: 'genesis-fuel-build-{stream}'
+    name: 'genesis-fuel-deploy-runner-{stream}'
+
+    disabled: true
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - genesis-fuel-parameter:
+            installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "Used for overriding the GIT URL coming from parameters macro."
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
 
-    project-type: freestyle
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "genesis-foreman-daily.*"
+                - "genesis-foreman-deploy-runner-{stream}"
+                - "genesis-fuel-daily.*"
+
+    builders:
+        - 'fuel-lab-reconfig'
+        - trigger-builds:
+          - project: 'genesis-fuel-deploy-{stream}'
+            git-revision: true
+            block: true
+
+- job-template:
+    name: 'genesis-fuel-build-{stream}'
 
     node: ericsson-build
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
 
@@ -238,19 +299,21 @@
         - '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}'
 
-    project-type: freestyle
-
-    disabled: false
+    disabled: true
 
     node: opnfv-jump-2
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -264,35 +327,23 @@
             refspec: ''
             branch: '{branch}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     builders:
         - 'fuel-download-artifact'
         - 'fuel-deploy'
 
-- job-template:
-    name: 'genesis-fuel-deploy-runner-{stream}'
-
-    project-type: freestyle
-
-    disabled: false
+    publishers:
+        - email:
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
 
-    node: master
+- job-template:
+    name: 'genesis-fuel-lab-reconfig-{stream}'
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+    disabled: true
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
         - string:
@@ -306,26 +357,26 @@
             refspec: ''
             branch: '{branch}'
 
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "genesis-foreman-daily.*"
+
     builders:
         - 'fuel-lab-reconfig'
-        - trigger-builds:
-          - project: 'genesis-fuel-deploy-{stream}'
-            git-revision: true
-            block: true
 
 - job-template:
-    name: 'genesis-fuel-deploy-virtual-master'
-
-    project-type: freestyle
+    name: 'genesis-fuel-verify-deploy-virtual-{stream}'
 
-    disabled: false
+    disabled: true
 
     node: ericsson-build
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - fuel-parameter:
+        - genesis-fuel-parameter:
             installer: '{installer}'
             gs-pathname: ''
 
@@ -333,13 +384,7 @@
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: master
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
+            branch: 'master'
 
     builders:
         - 'fuel-deploy-virtual'
@@ -348,7 +393,7 @@
 # parameter macros
 ########################
 - parameter:
-    name: fuel-parameter
+    name: genesis-fuel-parameter
     parameters:
         - string:
             name: INSTALLER
@@ -439,7 +484,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/conf/linux_foundation_lab/pod2
             export BRIDGE=pxebr
 
             # cleanup first
@@ -455,8 +500,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 -nh"
+            sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE -nh
 
             echo
             echo "--------------------------------------------------------"
@@ -618,8 +663,8 @@
             done
 
             if [ "$ping_flag" -eq 1 ]; then
-              echo "Slave is pingable, now wait 60 seconds for services to start"
-              sleep 60
+              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
@@ -636,11 +681,11 @@
 # trigger macros
 ########################
 - trigger:
-    name: 'fuel-master'
+    name: 'genesis-fuel-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+        - timed: '0 5 * * *'
 
 - trigger:
-    name: 'fuel-stable-arno'
+    name: 'genesis-fuel-stable-arno-trigger'
     triggers:
-        - timed: '0 3 * * *'
+        - timed: '0 7 * * *'