X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffuel%2Ffuel.yml;h=d2f55acccc7842b3fabd7680707c5c51f6518364;hb=d457354f2d6c3cd22c96fca58192488fa6dc9e3b;hp=a2a0257ef3739fa70445124a34351b4e9dbd90cf;hpb=d888bcbab27ff0e3afb70243b3a327084078ddb4;p=releng.git

diff --git a/jjb/fuel/fuel.yml b/jjb/fuel/fuel.yml
index a2a0257ef..d2f55accc 100644
--- a/jjb/fuel/fuel.yml
+++ b/jjb/fuel/fuel.yml
@@ -11,10 +11,12 @@
 
     jobs:
         - 'fuel-verify-build-{stream}'
-        - 'fuel-verify-virtual-deploy-{stream}'
         - 'fuel-merge-build-{stream}'
-        - 'fuel-merge-virtual-deploy-{stream}'
+        - 'fuel-merge-deploy-virtual-{stream}'
         - 'fuel-daily-{stream}'
+        - 'fuel-build-{stream}'
+        - 'fuel-deploy-{stream}'
+        - 'fuel-lab-reconfig-{stream}'
 
     stream:
         - master:
@@ -28,8 +30,6 @@
 - job-template:
     name: 'fuel-verify-build-{stream}'
 
-    project-type: freestyle
-
     node: ericsson-build
 
     concurrent: true
@@ -39,12 +39,6 @@
             enabled: true
             max-total: 3
 
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
-
     parameters:
         - project-parameter:
             project: '{project}'
@@ -62,7 +56,10 @@
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users: '{ssh-credentials}'
+        - timeout:
+            timeout: 360
+            fail: true
 
     triggers:
         - gerrit:
@@ -82,19 +79,16 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+            readable-message: true
 
     builders:
         - shell:
             !include-raw ./fuel-build.sh
         - shell:
-            !include-raw ./fuel-upload-artifact.sh
-#        - shell:
-#            !include-raw ./fuel-workspace-cleanup.sh
+            !include-raw ./fuel-workspace-cleanup.sh
 
 - job-template:
-    name: 'fuel-verify-virtual-deploy-{stream}'
-
-    project-type: freestyle
+    name: 'fuel-merge-build-{stream}'
 
     node: ericsson-build
 
@@ -104,13 +98,6 @@
         - throttle:
             enabled: true
             max-total: 2
-            max-per-node: 1
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 10
-        artifactDaysToKeep: -1
-        artifactNumToKeep: -1
 
     parameters:
         - project-parameter:
@@ -119,52 +106,45 @@
             branch: '{branch}'
         - fuel-parameter:
             installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-
+            gs-pathname: ''
     scm:
         - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
+            refspec: ''
+            choosing-strategy: 'default'
 
     wrappers:
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users: '{ssh-credentials}'
+        - timeout:
+            timeout: 360
+            fail: true
 
     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'
+                - change-merged-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: '{project}'
                 branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            dependency-jobs: 'fuel-verify-build-{stream}'
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**/{branch}'
 
     builders:
         - shell:
-            !include-raw ./fuel-download-artifact.sh
+            !include-raw ./fuel-build.sh
         - shell:
-            !include-raw ./fuel-virtual-deploy.sh
-#        - shell:
-#            !include-raw ./fuel-workspace-cleanup.sh
+            !include-raw ./fuel-upload-artifact.sh
+        - shell:
+            !include-raw ./fuel-workspace-cleanup.sh
 
 - job-template:
-    name: 'fuel-merge-build-{stream}'
+    name: 'fuel-merge-deploy-virtual-{stream}'
 
-    project-type: freestyle
-
-    node: ericsson-build
+    node: fuel-deploy-virtual
 
     concurrent: true
 
@@ -172,12 +152,7 @@
         - throttle:
             enabled: true
             max-total: 2
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+            max-per-node: 1
 
     parameters:
         - project-parameter:
@@ -209,94 +184,161 @@
                 branches:
                     - branch-compare-type: 'ANT'
                       branch-pattern: '**/{branch}'
+            dependency-jobs: 'fuel-merge-build-{stream}'
 
     builders:
         - shell:
-            !include-raw ./fuel-build.sh
+            !include-raw ./fuel-download-artifact.sh
         - shell:
-            !include-raw ./fuel-upload-artifact.sh
-#        - shell:
-#            !include-raw ./fuel-workspace-cleanup.sh
+            !include-raw ./fuel-deploy-virtual.sh
+        - shell:
+            !include-raw ./fuel-workspace-cleanup.sh
 
-- job-template:
-    name: 'fuel-merge-virtual-deploy-{stream}'
+    publishers:
+        - email:
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
 
-    project-type: freestyle
+- job-template:
+    name: 'fuel-daily-{stream}'
 
     node: ericsson-build
 
-    concurrent: true
+    disabled: false
 
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 2
-            max-per-node: 1
-
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 40
-        artifactDaysToKeep: -1
-        artifactNumToKeep: 5
+    triggers:
+        - 'fuel-{strem}-trigger'
 
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
         - fuel-parameter:
             installer: '{installer}'
-            gs-pathname: ''
+            gs-pathname: '{gs-pathname}'
+
     scm:
-        - gerrit-trigger-scm:
+        - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            choosing-strategy: 'default'
+            branch: '{branch}'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+    builders:
+        - trigger-builds:
+          - project: 'fuel-build-{stream}'
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'fuel-deploy-{stream}'
+            git-revision: true
+            block: true
+        - trigger-builds:
+          - project: 'functest-fuel-opnfv-jump-2-daily-{stream}'
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'yardstick-fuel-lf-{stream}'
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
+        - trigger-builds:
+          - project: 'bottlenecks-daily-fuel-lf-{stream}'
+            block: true
+            block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
     triggers:
-        - gerrit:
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
-            dependency-jobs: 'fuel-merge-build-{stream}'
+        - 'fuel-{stream}-daily-trigger'
+
+- job-template:
+    name: 'fuel-build-{stream}'
+
+    node: ericsson-build
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - fuel-parameter:
+            installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    wrappers:
+        - timeout:
+            timeout: 360
+            fail: true
 
     builders:
         - shell:
-            !include-raw ./fuel-download-artifact.sh
+            !include-raw ./fuel-build.sh
+        - shell:
+            !include-raw ./fuel-upload-artifact.sh
         - shell:
-            !include-raw ./fuel-virtual-deploy.sh
-#        - shell:
-#            !include-raw ./fuel-workspace-cleanup.sh
+            !include-raw ./fuel-workspace-cleanup.sh
+
+    publishers:
+        - email:
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
 
 - job-template:
-    name: 'fuel-daily-{stream}'
+    name: 'fuel-deploy-{stream}'
 
-    node: ericsson-build
+    disabled: false
 
-    disabled: true
+    node: opnfv-jump-2
+
+    parameters:
+        - project-parameter:
+            project: '{project}'
+        - fuel-parameter:
+            installer: '{installer}'
+            gs-pathname: '{gs-pathname}'
+        - string:
+            name: GIT_BASE
+            default: ssh://gerrit.opnfv.org:29418/$PROJECT
+            description: "POD2 has some issues with cloning using https so that's why GIT_BASE is overriden here again."
+
+    scm:
+        - git-scm:
+            credentials-id: '{ssh-credentials}'
+            refspec: ''
+            branch: '{branch}'
+
+    builders:
+        - shell:
+            !include-raw ./fuel-download-artifact.sh
+        - shell:
+            !include-raw ./fuel-deploy.sh
 
-    project-type: freestyle
+    publishers:
+        - email:
+            recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
+- job-template:
+    name: 'fuel-lab-reconfig-{stream}'
+
+    disabled: true
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - 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:
@@ -304,16 +346,15 @@
             refspec: ''
             branch: '{branch}'
 
-    wrappers:
-        - ssh-agent-credentials:
-            user: '{ssh-credentials}'
-
-    triggers:
-        - timed: 'H H * * *'
+    properties:
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "apex-daily.*"
 
     builders:
         - shell:
-             echo "Hello World"
+            !include-raw ./fuel-lab-reconfig.sh
 
 ########################
 # parameter macros
@@ -341,3 +382,11 @@
             name: GS_URL
             default: artifacts.opnfv.org/$PROJECT{gs-pathname}
             description: "URL to Google Storage."
+
+########################
+# trigger macros
+########################
+- trigger:
+    name: 'fuel-master-daily-trigger'
+    triggers:
+        - timed: '0 3 * * *'