Fix Yamllint violations for jjb/compass4nfv

JIRA: RELENG-254

Change-Id: I11aee517b2a8af8d2e2519642872c84ba494a335
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>

4 files changed, 952 insertions, 953 deletions

diff --git a/jjb/compass4nfv/compass-ci-jobs.yml b/jjb/compass4nfv/compass-ci-jobs.yml
index 74236e311..5100787d7 100644
--- a/jjb/compass4nfv/compass-ci-jobs.yml
+++ b/jjb/compass4nfv/compass-ci-jobs.yml
@@ -1,3 +1,4 @@
+---
 - project:
 
     name: compass-ci
@@ -7,123 +8,122 @@
     project: 'compass4nfv'
 
     master: &master
-        stream: master
-        branch: '{stream}'
-        gs-pathname: ''
-        ppa-pathname: '/{stream}'
-        disabled: false
-        openstack-version: ocata
+      stream: master
+      branch: '{stream}'
+      gs-pathname: ''
+      ppa-pathname: '/{stream}'
+      disabled: false
+      openstack-version: ocata
     euphrates: &euphrates
-        stream: euphrates
-        branch: 'stable/{stream}'
-        disabled: false
-        gs-pathname: '/{stream}'
-        ppa-pathname: '/{stream}'
-        openstack-version: ocata
+      stream: euphrates
+      branch: 'stable/{stream}'
+      disabled: false
+      gs-pathname: '/{stream}'
+      ppa-pathname: '/{stream}'
+      openstack-version: ocata
     danube: &danube
-        stream: danube
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
-        ppa-pathname: '/{stream}'
-        disabled: false
-        openstack-version: newton
-#--------------------------------
-# POD, INSTALLER, AND BRANCH MAPPING
-#--------------------------------
-#        CI PODs
-#--------------------------------
+      stream: danube
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+      ppa-pathname: '/{stream}'
+      disabled: false
+      openstack-version: newton
+    # -------------------------------
+    # POD, INSTALLER, AND BRANCH MAPPING
+    # -------------------------------
+    #        CI PODs
+    # -------------------------------
     pod:
-        - baremetal:
-            slave-label: compass-baremetal-master
-            os-version: 'xenial'
-            <<: *master
-        - virtual:
-            slave-label: compass-virtual-master
-            os-version: 'xenial'
-            <<: *master
-        - baremetal:
-            slave-label: compass-baremetal-branch
-            os-version: 'xenial'
-            <<: *euphrates
-        - virtual:
-            slave-label: compass-virtual-branch
-            os-version: 'xenial'
-            <<: *euphrates
-#--------------------------------
-#        master
-#--------------------------------
-        - baremetal-centos:
-            slave-label: 'intel-pod8'
-            os-version: 'centos7'
-            <<: *master
-#--------------------------------
-#       danube for dovetail
-#--------------------------------
-        - huawei-pod7:
-            slave-label: 'huawei-pod7'
-            os-version: 'xenial'
-            <<: *danube
+      - baremetal:
+          slave-label: compass-baremetal-master
+          os-version: 'xenial'
+          <<: *master
+      - virtual:
+          slave-label: compass-virtual-master
+          os-version: 'xenial'
+          <<: *master
+      - baremetal:
+          slave-label: compass-baremetal-branch
+          os-version: 'xenial'
+          <<: *euphrates
+      - virtual:
+          slave-label: compass-virtual-branch
+          os-version: 'xenial'
+          <<: *euphrates
+      # -------------------------------
+      #        master
+      # -------------------------------
+      - baremetal-centos:
+          slave-label: 'intel-pod8'
+          os-version: 'centos7'
+          <<: *master
+      # -------------------------------
+      #       danube for dovetail
+      # -------------------------------
+      - huawei-pod7:
+          slave-label: 'huawei-pod7'
+          os-version: 'xenial'
+          <<: *danube
 
     scenario:
-        - 'os-nosdn-nofeature-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l2-nofeature-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l3-nofeature-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-onos-nofeature-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-ocl-nofeature-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-onos-sfc-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l2-moon-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-kvm-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-openo-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl-sfc-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-ovs_dpdk-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'k8-nosdn-nofeature-ha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-nofeature-noha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l3-nofeature-noha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l2-moon-noha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-kvm-noha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl-sfc-noha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-ovs_dpdk-noha':
-            disabled: false
-            auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
-
+      - 'os-nosdn-nofeature-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl_l2-nofeature-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl_l3-nofeature-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-onos-nofeature-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-ocl-nofeature-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-onos-sfc-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl_l2-moon-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-kvm-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-openo-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl-sfc-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-ovs_dpdk-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-nosdn-nofeature-ha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-nofeature-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl_l3-nofeature-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl_l2-moon-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-kvm-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl-sfc-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-ovs_dpdk-noha':
+          disabled: false
+          auto-trigger-name: 'compass-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-        - 'compass-{scenario}-{pod}-daily-{stream}'
-        - 'compass-deploy-{pod}-daily-{stream}'
+      - 'compass-{scenario}-{pod}-daily-{stream}'
+      - 'compass-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
@@ -136,178 +136,178 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-os-.*?-{pod}-daily-.*?'
-                - 'compass-os-.*?-baremetal-daily-.*?'
-                - 'compass-verify-[^-]*-[^-]*'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-os-.*?-{pod}-daily-.*?'
+            - 'compass-os-.*?-baremetal-daily-.*?'
+            - 'compass-verify-[^-]*-[^-]*'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - fix-workspace-permissions
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - fix-workspace-permissions
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-ci-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-            ppa-pathname: '{ppa-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
-        - '{slave-label}-defaults'
-        - '{installer}-defaults'
-
-    triggers:
-        - '{auto-trigger-name}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-ci-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
+
+    triggers:
+      - '{auto-trigger-name}'
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - trigger-builds:
-            - project: 'compass-deploy-{pod}-daily-{stream}'
-              current-parameters: true
-              predefined-parameters: |
-                DEPLOY_SCENARIO={scenario}
-                COMPASS_OS_VERSION={os-version}
-                COMPASS_OPENSTACK_VERSION={openstack-version}
-              same-node: true
-              block: true
-        - trigger-builds:
-            - project: 'functest-compass-{pod}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              same-node: true
-              block: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-            - project: 'yardstick-compass-{pod}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        # dovetail only master by now, not sync with A/B/C branches
-        # here the stream means the SUT stream, dovetail stream is defined in its own job
-        # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario
-        # run against SUT master branch, dovetail docker image with latest tag
-        # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday)
-        # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday)
-        - conditional-step:
-            condition-kind: and
-            condition-operands:
-                - condition-kind: regex-match
-                  regex: danube
-                  label: '{stream}'
-                - condition-kind: regex-match
-                  regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
-                  label: '{scenario}'
-                - condition-kind: day-of-week
-                  day-selector: select-days
-                  days:
-                      MON: true
-                      SUN: true
-                  use-build-time: true
-            steps:
-                - trigger-builds:
-                    - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
-                      current-parameters: false
-                      predefined-parameters: |
-                        DOCKER_TAG=latest
-                        DEPLOY_SCENARIO={scenario}
-                      block: true
-                      same-node: true
-                      block-thresholds:
-                        build-step-failure-threshold: 'never'
-                        failure-threshold: 'never'
-                        unstable-threshold: 'FAILURE'
-        - conditional-step:
-            condition-kind: and
-            condition-operands:
-                - condition-kind: regex-match
-                  regex: danube
-                  label: '{stream}'
-                - condition-kind: regex-match
-                  regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
-                  label: '{scenario}'
-                - condition-kind: day-of-week
-                  day-selector: select-days
-                  days:
-                      TUES: true
-                      WED: true
-                      THURS: true
-                      FRI: true
-                      SAT: true
-                  use-build-time: true
-            steps:
-                - trigger-builds:
-                    - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
-                      current-parameters: false
-                      predefined-parameters:
-                        DEPLOY_SCENARIO={scenario}
-                      block: true
-                      same-node: true
-                      block-thresholds:
-                        build-step-failure-threshold: 'never'
-                        failure-threshold: 'never'
-                        unstable-threshold: 'FAILURE'
-        - conditional-step:
-            condition-kind: and
-            condition-operands:
-                - condition-kind: regex-match
-                  regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
-                  label: '{scenario}'
-                - condition-kind: regex-match
-                  regex: master
-                  label: '{stream}'
-            steps:
-                - trigger-builds:
-                    - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
-                      current-parameters: false
-                      predefined-parameters:
-                        DEPLOY_SCENARIO={scenario}
-                      block: true
-                      same-node: true
-                      block-thresholds:
-                        build-step-failure-threshold: 'never'
-                        failure-threshold: 'never'
-                        unstable-threshold: 'FAILURE'
-        - conditional-step:
-            condition-kind: and
-            condition-operands:
-                - condition-kind: regex-match
-                  regex: os-nosdn-nofeature-ha
-                  label: '{scenario}'
-            steps:
-                - trigger-builds:
-                    - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
-                      current-parameters: false
-                      predefined-parameters:
-                        DEPLOY_SCENARIO={scenario}
-                      block: true
-                      same-node: true
-                      block-thresholds:
-                        build-step-failure-threshold: 'never'
-                        failure-threshold: 'never'
-                        unstable-threshold: 'FAILURE'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - trigger-builds:
+          - project: 'compass-deploy-{pod}-daily-{stream}'
+            current-parameters: true
+            predefined-parameters: |
+              DEPLOY_SCENARIO={scenario}
+              COMPASS_OS_VERSION={os-version}
+              COMPASS_OPENSTACK_VERSION={openstack-version}
+            same-node: true
+            block: true
+      - trigger-builds:
+          - project: 'functest-compass-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            same-node: true
+            block: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'yardstick-compass-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+      # dovetail only master by now, not sync with A/B/C branches
+      # here the stream means the SUT stream, dovetail stream is defined in its own job
+      # only run on os-(nosdn|odl_l2|onos|odl_l3)-nofeature-ha scenario
+      # run against SUT master branch, dovetail docker image with latest tag
+      # run against SUT danube branch, dovetail docker image with latest tag(Monday and Sunday)
+      # run against SUT danube branch, dovetail docker image with cvp.X.X.X tag(Tuesday, Thursday, Friday and Saturday)
+      - conditional-step:
+          condition-kind: and
+          condition-operands:
+            - condition-kind: regex-match
+              regex: danube
+              label: '{stream}'
+            - condition-kind: regex-match
+              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+              label: '{scenario}'
+            - condition-kind: day-of-week
+              day-selector: select-days
+              days:
+                MON: true
+                SUN: true
+              use-build-time: true
+          steps:
+            - trigger-builds:
+                - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DOCKER_TAG=latest
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
+      - conditional-step:
+          condition-kind: and
+          condition-operands:
+            - condition-kind: regex-match
+              regex: danube
+              label: '{stream}'
+            - condition-kind: regex-match
+              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+              label: '{scenario}'
+            - condition-kind: day-of-week
+              day-selector: select-days
+              days:
+                TUES: true
+                WED: true
+                THURS: true
+                FRI: true
+                SAT: true
+              use-build-time: true
+          steps:
+            - trigger-builds:
+                - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
+      - conditional-step:
+          condition-kind: and
+          condition-operands:
+            - condition-kind: regex-match
+              regex: os-(nosdn|odl_l2|odl_l3)-nofeature-ha
+              label: '{scenario}'
+            - condition-kind: regex-match
+              regex: master
+              label: '{stream}'
+          steps:
+            - trigger-builds:
+                - project: 'dovetail-compass-{pod}-proposed_tests-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
+      - conditional-step:
+          condition-kind: and
+          condition-operands:
+            - condition-kind: regex-match
+              regex: os-nosdn-nofeature-ha
+              label: '{scenario}'
+          steps:
+            - trigger-builds:
+                - project: 'bottlenecks-compass-posca_stress_ping-{pod}-daily-{stream}'
+                  current-parameters: false
+                  predefined-parameters:
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-daily-{stream}'
@@ -317,61 +317,61 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-deploy-{pod}-daily-.*?'
-                - 'compass-verify-deploy-.*?'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-deploy-{pod}-daily-.*?'
+            - 'compass-verify-deploy-.*?'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 240
-            abort: true
-        - fix-workspace-permissions
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: 240
+          abort: true
+      - fix-workspace-permissions
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-ci-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-            ppa-pathname: '{ppa-pathname}'
-        - '{slave-label}-defaults'
-        - '{installer}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-ci-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - conditional-step:
-            condition-kind: regex-match
-            regex: master
-            label: '{stream}'
-            steps:
-                - shell:
-                    !include-raw-escape: ./compass-build.sh
-                - shell:
-                    !include-raw-escape: ./compass-deploy.sh
-        - conditional-step:
-            condition-kind: regex-match
-            regex: (danube|euphrates)
-            label: '{stream}'
-            steps:
-                - shell:
-                    !include-raw-escape: ./compass-download-artifact.sh
-                - shell:
-                    !include-raw-escape: ./compass-deploy.sh
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - conditional-step:
+          condition-kind: regex-match
+          regex: master
+          label: '{stream}'
+          steps:
+            - shell:
+                !include-raw-escape: ./compass-build.sh
+            - shell:
+                !include-raw-escape: ./compass-deploy.sh
+      - conditional-step:
+          condition-kind: regex-match
+          regex: (danube|euphrates)
+          label: '{stream}'
+          steps:
+            - shell:
+                !include-raw-escape: ./compass-download-artifact.sh
+            - shell:
+                !include-raw-escape: ./compass-deploy.sh
 
 ########################
 # parameter macros
@@ -379,504 +379,505 @@
 - parameter:
     name: compass-ci-parameter
     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: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "URL to Google Storage."
-        - 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: PPA_REPO
-            default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
-        - string:
-            name: PPA_CACHE
-            default: "$WORKSPACE/work/repo/"
+      - 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: GS_URL
+          default: '$GS_BASE{gs-pathname}'
+          description: "URL to Google Storage."
+      - 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: PPA_REPO
+          default: "http://artifacts.opnfv.org/compass4nfv/package{ppa-pathname}"
+      - string:
+          name: PPA_CACHE
+          default: "$WORKSPACE/work/repo/"
 
 ########################
 # trigger macros
 ########################
 
-#---------------------------
+# --------------------------
 # ha-baremetal-centos-master
-#---------------------------
+# --------------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: '0 19 * * *'
+      - timed: '0 19 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: '0 15 * * *'
+      - timed: '0 15 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-onos-sfc-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 
-#-----------------------------
+# ----------------------------
 # noha-baremetal-centos-master
-#-----------------------------
+# ----------------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-noha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-centos-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 
-#---------------------------
+# --------------------------
 # ha-huawei-pod7-danube
-#---------------------------
+# --------------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: '' #'0 19 * * *'
+      - timed: ''  # '0 19 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: '' #'0 21 * * *'
+      - timed: ''  # '0 21 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: '' #'0 15 * * *'
+      - timed: ''  # '0 15 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-onos-sfc-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 
-#-----------------------------
+# ----------------------------
 # noha-huawei-pod7-danube
-#-----------------------------
+# ----------------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-noha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-huawei-pod7-danube-trigger'
     triggers:
-        - timed: ''
-#--------------------
+      - timed: ''
+
+# -------------------
 # ha-baremetal-master
-#--------------------
+# -------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 20 * * *'
+      - timed: '0 20 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 18 * * *'
+      - timed: '0 18 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-onos-sfc-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 12 * * *'
+      - timed: '0 12 * * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 14 * * *'
+      - timed: '0 14 * * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 16 * * *'
+      - timed: '0 16 * * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-master-trigger'
     triggers:
-        - timed: '0 10 * * *'
+      - timed: '0 10 * * *'
 
-#----------------------
+# ---------------------
 # noha-baremetal-master
-#----------------------
+# ---------------------
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-noha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 
-#--------------------
+# -------------------
 # ha-baremetal-euphrates
-#--------------------
+# -------------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 1 * * *'
+      - timed: '0 1 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 21 * * *'
+      - timed: '0 21 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-onos-sfc-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 5 * * *'
+      - timed: '0 5 * * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 13 * * *'
+      - timed: '0 13 * * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 9 * * *'
+      - timed: '0 9 * * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-ha-baremetal-euphrates-trigger'
     triggers:
-        - timed: '0 17 * * *'
+      - timed: '0 17 * * *'
 
-#----------------------
+# ---------------------
 # noha-baremetal-euphrates
-#----------------------
+# ---------------------
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl-sfc-noha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-baremetal-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 
-#------------------
+# -----------------
 # ha-virtual-master
-#------------------
+# -----------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 21 * * *'
+      - timed: '0 21 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 19 * * *'
+      - timed: '0 19 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-onos-sfc-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-master-trigger'
     triggers:
-        - timed: '30 12 * * *'
+      - timed: '30 12 * * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 13 * * *'
+      - timed: '0 13 * * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 17 * * *'
+      - timed: '0 17 * * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 12 * * *'
+      - timed: '0 12 * * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-virtual-master-trigger'
     triggers:
-        - timed: '0 16 * * *'
+      - timed: '0 16 * * *'
 
-#--------------------
+# -------------------
 # noha-virtual-master
-#--------------------
+# -------------------
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-virtual-master-trigger'
     triggers:
-        - timed: '30 13 * * *'
+      - timed: '30 13 * * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 14 * * *'
+      - timed: '0 14 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 15 * * *'
+      - timed: '0 15 * * *'
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 18 * * *'
+      - timed: '0 18 * * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 20 * * *'
+      - timed: '0 20 * * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-master-trigger'
     triggers:
-        - timed: '0 11 * * *'
+      - timed: '0 11 * * *'
 
-#------------------
+# -----------------
 # ha-virtual-euphrates
-#------------------
+# -----------------
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 23 * * *'
+      - timed: '0 23 * * *'
 - trigger:
     name: 'compass-os-nosdn-openo-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l3-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 22 * * *'
+      - timed: '0 22 * * *'
 - trigger:
     name: 'compass-os-onos-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-ocl-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-onos-sfc-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'compass-os-odl_l2-moon-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 20 * * *'
+      - timed: '0 20 * * *'
 - trigger:
     name: 'compass-os-nosdn-kvm-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 16 * * *'
+      - timed: '0 16 * * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 14 * * *'
+      - timed: '0 14 * * *'
 - trigger:
     name: 'compass-os-odl-sfc-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 18 * * *'
+      - timed: '0 18 * * *'
 - trigger:
     name: 'compass-k8-nosdn-nofeature-ha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 13 * * *'
+      - timed: '0 13 * * *'
 
-#--------------------
+# -------------------
 # noha-virtual-euphrates
-#--------------------
+# -------------------
 - trigger:
     name: 'compass-os-nosdn-kvm-noha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 15 * * *'
+      - timed: '0 15 * * *'
 - trigger:
     name: 'compass-os-nosdn-nofeature-noha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 17 * * *'
+      - timed: '0 17 * * *'
 - trigger:
     name: 'compass-os-odl_l3-nofeature-noha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 23 * * *'
+      - timed: '0 23 * * *'
 - trigger:
     name: 'compass-os-odl_l2-moon-noha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 21 * * *'
+      - timed: '0 21 * * *'
 - trigger:
     name: 'compass-os-odl-sfc-noha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 19 * * *'
+      - timed: '0 19 * * *'
 - trigger:
     name: 'compass-os-nosdn-ovs_dpdk-noha-virtual-euphrates-trigger'
     triggers:
-        - timed: '0 12 * * *'
+      - timed: '0 12 * * *'
diff --git a/jjb/compass4nfv/compass-dovetail-jobs.yml b/jjb/compass4nfv/compass-dovetail-jobs.yml
index 101db8241..f0e1c2d3f 100644
--- a/jjb/compass4nfv/compass-dovetail-jobs.yml
+++ b/jjb/compass4nfv/compass-dovetail-jobs.yml
@@ -1,38 +1,39 @@
+---
 - project:
 
     name: 'compass-dovetail-jobs'
     installer: 'compass'
     project: 'compass4nfv'
-#----------------------------------
-# BRANCH ANCHORS
-#----------------------------------
+    # ---------------------------------
+    # BRANCH ANCHORS
+    # ---------------------------------
     danube: &danube
-        stream: danube
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
-        disabled: false
-        dovetail-branch: master
-#------------------------------------
-# POD, INSTALLER, AND BRANCH MAPPING
-#------------------------------------
-#        CI PODs
-#------------------------------------
+      stream: danube
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+      disabled: false
+      dovetail-branch: master
+    # -----------------------------------
+    # POD, INSTALLER, AND BRANCH MAPPING
+    # -----------------------------------
+    #        CI PODs
+    # -----------------------------------
     pod:
-        - baremetal:
-            slave-label: compass-baremetal-branch
-            os-version: 'xenial'
-            <<: *danube
-#-----------------------------------
-# scenarios
-#-----------------------------------
+      - baremetal:
+          slave-label: compass-baremetal-branch
+          os-version: 'xenial'
+          <<: *danube
+    # ----------------------------------
+    # scenarios
+    # ----------------------------------
     scenario:
-        - 'os-nosdn-nofeature-ha':
-            disabled: true
-            auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'
+      - 'os-nosdn-nofeature-ha':
+          disabled: true
+          auto-trigger-name: 'compass-{scenario}-{pod}-weekly-{stream}-trigger'
 
     jobs:
-        - 'compass-{scenario}-{pod}-weekly-{stream}'
-        - 'compass-deploy-{pod}-weekly-{stream}'
+      - 'compass-{scenario}-{pod}-weekly-{stream}'
+      - 'compass-deploy-{pod}-weekly-{stream}'
 
 ########################
 # job templates
@@ -45,70 +46,67 @@
     concurrent: false
 
     properties:
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'compass-os-.*?-{pod}-daily-.*?'
-                - 'compass-os-.*?-{pod}-weekly-.*?'
-            block-level: 'NODE'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'compass-os-.*?-{pod}-daily-.*?'
+            - 'compass-os-.*?-{pod}-weekly-.*?'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - fix-workspace-permissions
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - fix-workspace-permissions
 
     triggers:
-        - '{auto-trigger-name}'
+      - '{auto-trigger-name}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-dovetail-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
-        - '{slave-label}-defaults'
-        - '{installer}-defaults'
-
-    triggers:
-        - '{auto-trigger-name}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-dovetail-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - trigger-builds:
-            - project: 'compass-deploy-{pod}-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO={scenario}
-                COMPASS_OS_VERSION={os-version}
-              same-node: true
-              block: true
-        - trigger-builds:
-            - project: 'dovetail-compass-{pod}-compliance_set-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-            - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - trigger-builds:
+          - project: 'compass-deploy-{pod}-weekly-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO={scenario}
+              COMPASS_OS_VERSION={os-version}
+            same-node: true
+            block: true
+      - trigger-builds:
+          - project: 'dovetail-compass-{pod}-compliance_set-weekly-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'dovetail-compass-{pod}-proposed_tests-weekly-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'compass-deploy-{pod}-weekly-{stream}'
@@ -118,48 +116,48 @@
     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-deploy-{pod}-daily-.*?'
-                - 'compass-deploy-{pod}-weekly-.*'
-                - 'compass-verify-deploy-.*?'
-            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-deploy-{pod}-daily-.*?'
+            - 'compass-deploy-{pod}-weekly-.*'
+            - 'compass-verify-deploy-.*?'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 240
-            abort: true
-        - fix-workspace-permissions
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: 240
+          abort: true
+      - fix-workspace-permissions
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-dovetail-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-        - '{slave-label}-defaults'
-        - '{installer}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-dovetail-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+      - '{slave-label}-defaults'
+      - '{installer}-defaults'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - shell:
-            !include-raw-escape: ./compass-download-artifact.sh
-        - shell:
-            !include-raw-escape: ./compass-deploy.sh
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - shell:
+          !include-raw-escape: ./compass-download-artifact.sh
+      - shell:
+          !include-raw-escape: ./compass-deploy.sh
 
 ########################
 # parameter macros
@@ -167,18 +165,18 @@
 - parameter:
     name: compass-dovetail-parameter
     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: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "URL to Google Storage."
-        - choice:
-            name: COMPASS_OPENSTACK_VERSION
-            choices:
-                - 'newton'
+      - 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: GS_URL
+          default: '$GS_BASE{gs-pathname}'
+          description: "URL to Google Storage."
+      - choice:
+          name: COMPASS_OPENSTACK_VERSION
+          choices:
+            - 'newton'
 
 ########################
 # trigger macros
@@ -186,9 +184,9 @@
 - trigger:
     name: 'compass-os-nosdn-nofeature-ha-baremetal-weekly-danube-trigger'
     triggers:
-        - timed: 'H H * * 0'
+      - timed: 'H H * * 0'
 
 - trigger:
     name: 'dovetail-weekly-trigger'
     triggers:
-        - timed: 'H H * * 0'
+      - timed: 'H H * * 0'
diff --git a/jjb/compass4nfv/compass-project-jobs.yml b/jjb/compass4nfv/compass-project-jobs.yml
index fe9170578..13830ce1d 100644
--- a/jjb/compass4nfv/compass-project-jobs.yml
+++ b/jjb/compass4nfv/compass-project-jobs.yml
@@ -1,3 +1,4 @@
+---
 - project:
 
     name: compass-project
@@ -9,25 +10,25 @@
     slave-label: 'compass-virtual'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            ppa-pathname: '/{stream}'
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            ppa-pathname: '/{stream}'
-            disabled: false
-        - euphrates:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            ppa-pathname: '/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          ppa-pathname: '/{stream}'
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          ppa-pathname: '/{stream}'
+          disabled: false
+      - euphrates:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          ppa-pathname: '/{stream}'
+          disabled: false
 
     jobs:
-        - '{installer}-build-daily-{stream}'
-        - 'compass-build-ppa-{stream}'
+      - '{installer}-build-daily-{stream}'
+      - 'compass-build-ppa-{stream}'
 
 ########################
 # job templates
@@ -40,36 +41,36 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-            option: 'project'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 1
+          max-per-node: 1
+          option: 'project'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-            ppa-pathname: '{ppa-pathname}'
-        - 'opnfv-build-ubuntu-defaults'
-        - '{installer}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-project-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - 'opnfv-build-ubuntu-defaults'
+      - '{installer}-defaults'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - timed: 'H 8 * * *'
+      - timed: 'H 8 * * *'
 
     builders:
-        - shell:
-            !include-raw-escape: ./compass-build.sh
-        - shell:
-            !include-raw-escape: ./compass-upload-artifact.sh
-        - 'clean-workspace'
+      - shell:
+          !include-raw-escape: ./compass-build.sh
+      - shell:
+          !include-raw-escape: ./compass-upload-artifact.sh
+      - 'clean-workspace'
 
 - job-template:
     name: 'compass-build-ppa-{stream}'
@@ -83,30 +84,29 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-            option: 'project'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 1
+          max-per-node: 1
+          option: 'project'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - compass-project-parameter:
-            installer: '{installer}'
-            gs-pathname: '{gs-pathname}'
-            ppa-pathname: '{ppa-pathname}'
-        - '{node}-defaults'
-        - '{installer}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - compass-project-parameter:
+          installer: '{installer}'
+          gs-pathname: '{gs-pathname}'
+          ppa-pathname: '{ppa-pathname}'
+      - '{node}-defaults'
+      - '{installer}-defaults'
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - shell:
-            !include-raw-escape: ./compass-makeppa.sh
-
+      - shell:
+          !include-raw-escape: ./compass-makeppa.sh
 
 
 ########################
@@ -115,22 +115,21 @@
 - parameter:
     name: compass-project-parameter
     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/"
-
+      - 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/"
diff --git a/jjb/compass4nfv/compass-verify-jobs.yml b/jjb/compass4nfv/compass-verify-jobs.yml
index f4fe8f66c..6927145c8 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'
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          ppa-pathname: '/{stream}'
+          disabled: false
+          openstack-version: 'newton'
+          branch-type: 'branch'
 
     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,122 +59,122 @@
     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:
-                - 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_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
+      - 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_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}'
@@ -185,97 +186,97 @@
     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
+            - 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
 
 - job-template:
     name: 'compass-verify-{phase}-{distro}-{stream}'
@@ -285,33 +286,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: 240
+          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
@@ -319,44 +320,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'