X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-project-jobs.yml;h=e92c7653b6b24ea3b241539d5368b30de8ad96dc;hb=d1a117e87cfdccd2e45ea2e286191081b37c04af;hp=565aaa33f3e9466086b61782e048862792ee89f5;hpb=acbc6c8cc62a269a0276c59a8035e134e3041371;p=releng.git

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 565aaa33f..e92c7653b 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -6,6 +6,8 @@
 
     project: 'compass4nfv'
 
+    slave-label: 'compass-virtual'
+
     stream:
         - master:
             branch: '{stream}'
@@ -15,26 +17,12 @@
             gs-pathname: '/{stream}'
 
 
-    scenario:
-        - 'os-nosdn-nofeature-ha':
-            disabled: false
-            node: huawei-deploy-vm
-        - 'os-odl_l2-nofeature-ha':
-            disabled: false
-            node: huawei-deploy-vm
-        - 'os-onos-nofeature-ha':
-            disabled: false
-            node: huawei-deploy-vm
-#        - 'os-ocl-nofeature-ha':
-#            disabled: true
-#            node: huawei-deploy-vm
-
     jobs:
         - 'compass-verify-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-deploy-virtual-{scenario}-{stream}'
-        - 'compass-virtual-daily-{stream}'
+        - 'compass-verify-deploy-{stream}'
+
 
 ########################
 # job templates
@@ -44,15 +32,24 @@
 
     disabled: false
 
-    node: 'huawei-deploy-vm'
-
     concurrent: true
 
+    wrappers:
+        - timeout:
+            timeout: 120
+            fail: true
+
     properties:
         - throttle:
             enabled: true
-            max-total: 3
             max-per-node: 1
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-verify-[^-]*'
+                - 'compass-os-.*?-virtual-daily-.*?'
+            block-level: 'NODE'
 
     parameters:
         - project-parameter:
@@ -62,18 +59,12 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - '{node}-defaults'
         - '{installer}-defaults'
+        - '{slave-label}-defaults'
         - string:
             name: DEPLOY_SCENARIO
             default: 'os-nosdn-nofeature-ha'
 
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
     triggers:
         - gerrit:
             trigger-on:
@@ -92,76 +83,68 @@
                 branches:
                   - branch-compare-type: 'ANT'
                     branch-pattern: '**/{branch}'
+                file-paths:
+                  - compare-type: ANT
+                    pattern: '**/*'
                 forbidden-file-paths:
                   - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+                    pattern: 'docs/**'
 
     builders:
-        - shell:
-            !include-raw: ./compass-build.sh
-        - shell:
-            !include-raw: ./compass-deploy-virtual.sh
-
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
+        - trigger-builds:
+            - project: 'compass-verify-deploy-{stream}'
+              current-parameters: true
+              same-node: true
+              block: true
+        - trigger-builds:
+            - project: 'functest-{slave-label}-suite-{stream}'
+              current-parameters: true
+              predefined-parameters:
+                FUNCTEST_SUITE_NAME=healthcheck
+              same-node: true
+              block: true
+              block-thresholds:
+                build-step-failure-threshold: 'never'
+                failure-threshold: 'never'
+                unstable-threshold: 'FAILURE'
 
 - job-template:
-    name: 'compass-virtual-daily-{stream}'
-
-    node: huawei-build
+    name: 'compass-verify-deploy-{stream}'
 
     concurrent: true
 
     properties:
         - throttle:
             enabled: true
-            max-total: 1
             max-per-node: 1
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - '{node}-defaults'
-        - '{installer}-defaults'
+            option: 'project'
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - 'compass-deploy-virtual-daily-.*?'
+            block-level: 'NODE'
 
     scm:
-        - git-scm:
+        - gerrit-trigger-scm:
             credentials-id: '{ssh-credentials}'
-            refspec: ''
-            branch: '{branch}'
-
-    triggers:
-        - timed: 'H 14 * * *'
+            refspec: '$GERRIT_REFSPEC'
+            choosing-strategy: 'gerrit'
 
     builders:
-        - trigger-builds:
-          - project: 'compass-build-iso-{stream}'
-            git-revision: true
-            block: true
-        - trigger-builds:
-          - project: 'compass-deploy-virtual-os-nosdn-nofeature-ha-{stream}'
-            git-revision: true
-            block: false
-        - trigger-builds:
-          - project: 'compass-deploy-virtual-os-odl_l2-nofeature-ha-{stream}'
-            git-revision: true
-            block: false
-        - trigger-builds:
-          - project: 'compass-deploy-virtual-os-onos-nofeature-ha-{stream}'
-            git-revision: true
-            block: false
+        - shell:
+            !include-raw-escape: ./compass-build.sh
+        - shell:
+            !include-raw-escape: ./compass-deploy.sh
+
+    publishers:
+        - archive:
+            artifacts: 'ansible.log'
+            allow-empty: 'true'
+            fingerprint: true
 
 - job-template:
     name: 'compass-build-iso-{stream}'
 
-    node: ericsson-build
-
     concurrent: true
 
     properties:
@@ -169,6 +152,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
@@ -176,7 +160,7 @@
         - compass-project-parameter:
             installer: '{installer}'
             gs-pathname: '{gs-pathname}'
-        - '{node}-defaults'
+        - 'opnfv-build-ubuntu-defaults'
         - '{installer}-defaults'
 
     scm:
@@ -185,13 +169,16 @@
             refspec: ''
             branch: '{branch}'
 
+    triggers:
+        - timed: 'H 8 * * *'
+
     builders:
         - shell:
-            !include-raw: ./compass-build.sh
+            !include-raw-escape: ./compass-build.sh
         - shell:
-            !include-raw: ./compass-upload-artifact.sh
+            !include-raw-escape: ./compass-upload-artifact.sh
         - shell:
-            !include-raw: ./compass-workspace-cleanup.sh
+            !include-raw-escape: ./compass-workspace-cleanup.sh
 
 - job-template:
     name: 'compass-build-ppa-{stream}'
@@ -207,6 +194,7 @@
             enabled: true
             max-total: 1
             max-per-node: 1
+            option: 'project'
 
     parameters:
         - project-parameter:
@@ -224,48 +212,9 @@
 
     builders:
         - shell:
-            !include-raw: ./compass-makeppa.sh
-
-- job-template:
-    name: 'compass-deploy-virtual-{scenario}-{stream}'
-
-    disabled: false
-
-    node: '{node}'
-
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
+            !include-raw-escape: ./compass-makeppa.sh
 
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
-        - '{node}-defaults'
-        - '{installer}-defaults'
-
-    builders:
-        - shell:
-            !include-raw: ./compass-workspace-precleanup.sh
-        - shell:
-            !include-raw: ./compass-download-artifact.sh
-        - shell:
-            !include-raw: ./compass-deploy-virtual.sh
 
-    publishers:
-        - archive:
-            artifacts: 'ansible.log'
-            allow-empty: 'true'
-            fingerprint: true
 
 ########################
 # parameter macros
@@ -279,7 +228,7 @@
             description: "Directory where the build artifact will be located upon the completion of the build."
         - string:
             name: CACHE_DIRECTORY
-            default: $HOME/opnfv/cache/$PROJECT
+            default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}"
             description: "Directory where the cache to be used during the build is located."
         - string:
             name: GS_URL
@@ -287,15 +236,15 @@
             description: "URL to Google Storage."
         - string:
             name: PPA_REPO
-            default: "http://205.177.226.235:9999"
+            default: "http://205.177.226.237:9999{gs-pathname}"
         - string:
             name: PPA_CACHE
             default: "$WORKSPACE/work/repo/"
         - choice:
             name: COMPASS_OPENSTACK_VERSION
             choices:
+                - 'mitaka'
                 - 'liberty'
-                - 'juno'
         - choice:
             name: COMPASS_OS_VERSION
             choices: