X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fcompass4nfv%2Fcompass-verify-jobs.yml;h=444b173615579f9ad4d1eae9db7b48ce139249b2;hb=f399b0e3193cbe4271057091b5d6b52fc5f86d43;hp=ee91e02daef8ba6c2c101e9045c9a710e3cb82f3;hpb=20b31307c730a6561107dba6299d3a47dd4c3090;p=releng.git

diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index ee91e02da..444b17361 100644
--- a/jjb/compass4nfv/compass-verify-jobs.yml
+++ b/jjb/compass4nfv/compass-verify-jobs.yml
@@ -1,50 +1,51 @@
+---
 - project:
     name: 'compass-verify-jobs'
 
     project: 'compass4nfv'
 
     installer: 'compass'
-#####################################
-# branch definitions
-#####################################
+    #####################################
+    # branch definitions
+    #####################################
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            ppa-pathname: '/{stream}'
-            disabled: false
-            openstack-version: 'ocata'
-            branch-type: 'master'
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            ppa-pathname: '/{stream}'
-            disabled: false
-            openstack-version: 'newton'
-            branch-type: 'branch'
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          ppa-pathname: '/{stream}'
+          disabled: false
+          openstack-version: 'ocata'
+          branch-type: 'master'
+      - euphrates:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          ppa-pathname: '/{stream}'
+          disabled: false
+          openstack-version: 'ocata'
+          branch-type: 'master'
 
     distro:
-        - 'xenial':
-            disabled: false
-            os-version: 'xenial'
-            openstack-os-version: ''
-        - 'centos7':
-            disabled: true
-            os-version: 'centos7'
-            openstack-os-version: ''
-#####################################
-# patch verification phases
-#####################################
+      - 'xenial':
+          disabled: false
+          os-version: 'xenial'
+          openstack-os-version: ''
+      - 'centos7':
+          disabled: true
+          os-version: 'centos7'
+          openstack-os-version: ''
+    #####################################
+    # patch verification phases
+    #####################################
     phase:
-        - 'basic'
-        - 'deploy-virtual'
-#####################################
-# jobs
-#####################################
+      - 'basic'
+      - 'deploy-virtual'
+    #####################################
+    # jobs
+    #####################################
     jobs:
-        - 'compass-verify-{distro}-{stream}'
-        - 'compass-verify-k8-{distro}-{stream}'
-        - 'compass-verify-{phase}-{distro}-{stream}'
+      - 'compass-verify-{distro}-{stream}'
+      - 'compass-verify-k8-{distro}-{stream}'
+      - 'compass-verify-{phase}-{distro}-{stream}'
 #####################################
 # job templates
 #####################################
@@ -58,120 +59,118 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 4
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-verify-[^-]*-[^-]*'
-                - 'compass-os-.*?-virtual-daily-.*?'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 4
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-verify-[^-]*-[^-]*'
+            - 'compass-os-.*?-virtual-daily-.*?'
+            - 'compass-k8-.*?-virtual-daily-.*?'
+          block-level: 'NODE'
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 240
-            fail: true
-        - fix-workspace-permissions
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
+      - fix-workspace-permissions
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            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: '**/*'
-                disable-strict-forbidden-file-verification: 'true'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-            readable-message: true
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          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: '**/*'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**'
+          readable-message: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'compass-virtual-{branch-type}-defaults'
-        - '{installer}-defaults'
-        - 'compass-verify-defaults':
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-            ppa-pathname: '{ppa-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'compass-virtual-{branch-type}-defaults'
+      - '{installer}-defaults'
+      - 'compass-verify-defaults':
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - multijob:
-            name: basic
-            condition: SUCCESSFUL
-            projects:
-                - name: 'opnfv-lint-verify-{stream}'
-                  current-parameters: true
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                - name: 'opnfv-yamllint-verify-{stream}'
-                  current-parameters: true
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: deploy-virtual
-            condition: SUCCESSFUL
-            projects:
-                - name: 'compass-verify-deploy-virtual-{distro}-{stream}'
-                  current-parameters: true
-                  predefined-parameters: |
-                    COMPASS_OS_VERSION={os-version}
-                    COMPASS_OPENSTACK_VERSION={openstack-version}
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: smoke-test
-            condition: SUCCESSFUL
-            projects:
-                - name: 'functest-compass-virtual-suite-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    FUNCTEST_SUITE_NAME=healthcheck
-                    DEPLOY_SCENARIO=os-nosdn-nofeature-ha
-                  node-parameters: true
-                  kill-phase-on: NEVER
-                  abort-all-job: true
-                - name: 'functest-compass-virtual-suite-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    FUNCTEST_SUITE_NAME=vping_ssh
-                    DEPLOY_SCENARIO=os-nosdn-nofeature-ha
-                  node-parameters: true
-                  kill-phase-on: NEVER
-                  abort-all-job: true
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: basic
+          condition: SUCCESSFUL
+          projects:
+            - name: 'opnfv-lint-verify-{stream}'
+              current-parameters: true
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: deploy-virtual
+          condition: SUCCESSFUL
+          projects:
+            - name: 'compass-verify-deploy-virtual-{distro}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                COMPASS_OS_VERSION={os-version}
+                COMPASS_OPENSTACK_VERSION={openstack-version}
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: smoke-test
+          condition: SUCCESSFUL
+          projects:
+            - name: 'functest-compass-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                FUNCTEST_MODE=tier
+                FUNCTEST_TIER=healthcheck
+                DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
+            - name: 'functest-compass-virtual-suite-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                FUNCTEST_MODE=testcase
+                FUNCTEST_SUITE_NAME=vping_ssh
+                DEPLOY_SCENARIO=os-nosdn-nofeature-ha
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
 
 - job-template:
     name: 'compass-verify-k8-{distro}-{stream}'
@@ -183,97 +182,92 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 4
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-verify-[^-]*-[^-]*'
-                - 'compass-os-.*?-virtual-daily-.*?'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 4
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-verify-[^-]*-[^-]*'
+            - 'compass-os-.*?-virtual-daily-.*?'
+          block-level: 'NODE'
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 240
-            fail: true
-        - fix-workspace-permissions
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 240
+          fail: true
+      - fix-workspace-permissions
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: 'check k8'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify k8'
-                - comment-added-contains-event:
-                    comment-contains-value: 'check kubernetes'
-                - comment-added-contains-event:
-                    comment-contains-value: 'verify kubernetes'
-            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/**'
-            readable-message: true
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'check k8'
+            - comment-added-contains-event:
+                comment-contains-value: 'verify k8'
+            - comment-added-contains-event:
+                comment-contains-value: 'check kubernetes'
+            - comment-added-contains-event:
+                comment-contains-value: 'verify kubernetes'
+          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/**'
+          readable-message: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'compass-virtual-{branch-type}-defaults'
-        - '{installer}-defaults'
-        - 'compass-verify-defaults':
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-            ppa-pathname: '{ppa-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'k8-nosdn-nofeature-ha'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'compass-virtual-{branch-type}-defaults'
+      - '{installer}-defaults'
+      - 'compass-verify-defaults':
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'k8-nosdn-nofeature-ha'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - multijob:
-            name: basic
-            condition: SUCCESSFUL
-            projects:
-                - name: 'opnfv-lint-verify-{stream}'
-                  current-parameters: true
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-                - name: 'opnfv-yamllint-verify-{stream}'
-                  current-parameters: true
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: deploy-virtual
-            condition: SUCCESSFUL
-            projects:
-                - name: 'compass-verify-deploy-virtual-{distro}-{stream}'
-                  current-parameters: true
-                  predefined-parameters: |
-                    COMPASS_OS_VERSION={os-version}
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: basic
+          condition: SUCCESSFUL
+          projects:
+            - name: 'opnfv-lint-verify-{stream}'
+              current-parameters: true
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: deploy-virtual
+          condition: SUCCESSFUL
+          projects:
+            - name: 'compass-verify-deploy-virtual-{distro}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                COMPASS_OS_VERSION={os-version}
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
 
 - job-template:
     name: 'compass-verify-{phase}-{distro}-{stream}'
@@ -283,33 +277,33 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-os-.*?-virtual-daily-.*?'
-                - 'compass-verify-deploy-.*'
-                - 'functest-compass-virtual.*'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-os-.*?-virtual-daily-.*?'
+            - 'compass-verify-deploy-.*'
+            - 'functest-compass-virtual.*'
+          block-level: 'NODE'
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 240
-            fail: true
-        - fix-workspace-permissions
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
+      - fix-workspace-permissions
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - '{project}-verify-{phase}-macro'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-verify-{phase}-macro'
 
 #####################################
 # builder macros
@@ -317,44 +311,44 @@
 - builder:
     name: 'compass4nfv-verify-basic-macro'
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            echo "Not activated!"
+          echo "Not activated!"
 
 - builder:
     name: 'compass4nfv-verify-deploy-virtual-macro'
     builders:
-        - shell:
-            !include-raw: ./compass-build.sh
-        - shell:
-            !include-raw: ./compass-deploy.sh
+      - shell:
+          !include-raw: ./compass-build.sh
+      - shell:
+          !include-raw: ./compass-deploy.sh
 #####################################
 # parameter macros
 #####################################
 - parameter:
     name: 'compass-verify-defaults'
     parameters:
-        - string:
-            name: BUILD_DIRECTORY
-            default: $WORKSPACE/build_output
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: CACHE_DIRECTORY
-            default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}"
-            description: "Directory where the cache to be used during the build is located."
-        - string:
-            name: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "URL to Google Storage."
-        - string:
-            name: PPA_REPO
-            default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
-        - string:
-            name: PPA_CACHE
-            default: "$WORKSPACE/work/repo/"
-        - choice:
-            name: COMPASS_OS_VERSION
-            choices:
-                - 'xenial'
-                - 'centos7'
+      - string:
+          name: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+      - string:
+          name: CACHE_DIRECTORY
+          default: "$HOME/opnfv/cache/$PROJECT{gs-pathname}"
+          description: "Directory where the cache to be used during the build is located."
+      - string:
+          name: GS_URL
+          default: '$GS_BASE{gs-pathname}'
+          description: "URL to Google Storage."
+      - string:
+          name: PPA_REPO
+          default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
+      - string:
+          name: PPA_CACHE
+          default: "$WORKSPACE/work/repo/"
+      - choice:
+          name: COMPASS_OS_VERSION
+          choices:
+            - 'xenial'
+            - 'centos7'