compass: Update verify jobs and introduce Multijob and verify phases

[releng.git] / jjb / compass4nfv / compass-project-jobs.yml

diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index 5ce9064..3a52e91 100644 (file)
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -16,144 +16,13 @@
             branch: 'stable/{stream}'
             gs-pathname: '/{stream}'
 
-    distro:
-        - 'trusty':
-            disabled: false
-            os-version: 'trusty'
-            openstack-os-version: ''
-        - 'centos7':
-            disabled: false
-            os-version: 'centos7'
-            openstack-os-version: ''
-
     jobs:
-        - 'compass-verify-{distro}-{stream}'
         - 'compass-build-iso-{stream}'
         - 'compass-build-ppa-{stream}'
-        - 'compass-verify-deploy-{distro}-{stream}'
-
 
 ########################
 # job templates
 ########################
-- job-template:
-    name: 'compass-verify-{distro}-{stream}'
-
-    disabled: false
-
-    concurrent: true
-
-    wrappers:
-        - timeout:
-            timeout: 120
-            fail: true
-
-    properties:
-        - throttle:
-            enabled: true
-            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:
-            project: '{project}'
-        - gerrit-parameter:
-            branch: '{branch}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-
-    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: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: '**/*'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-
-    builders:
-        - trigger-builds:
-            - project: 'compass-verify-deploy-{distro}-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                COMPASS_OS_VERSION={os-version}
-                COMPASS_OS_VERSION_OPTION={openstack-os-version}
-              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-verify-deploy-{distro}-{stream}'
-
-    concurrent: true
-
-    properties:
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-deploy-virtual-daily-.*?'
-            block-level: 'NODE'
-
-    scm:
-        - gerrit-trigger-scm:
-            credentials-id: '{ssh-credentials}'
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    builders:
-        - 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}'