Merge "Fix Yamllint violations for jjb/dovetail"

4 files changed, 434 insertions, 429 deletions

diff --git a/jjb/dovetail/dovetail-artifacts-upload.yml b/jjb/dovetail/dovetail-artifacts-upload.yml
index 0c8efbe0d..9a11c6e26 100644
--- a/jjb/dovetail/dovetail-artifacts-upload.yml
+++ b/jjb/dovetail/dovetail-artifacts-upload.yml
@@ -1,3 +1,4 @@
+---
 ############################################
 # dovetail upload artifacts job
 ############################################
@@ -7,20 +8,20 @@
     project: 'dovetail'
 
     jobs:
-        - 'dovetail-{image}-artifacts-upload-{stream}'
+      - 'dovetail-{image}-artifacts-upload-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
 
     image:
-        - 'dovetail'
-        - 'functest'
-        - 'yardstick'
-        - 'testapi'
-        - 'mongo'
+      - 'dovetail'
+      - 'functest'
+      - 'yardstick'
+      - 'testapi'
+      - 'mongo'
 
 #############################################
 # job template
@@ -35,30 +36,30 @@
     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}'
-        - 'opnfv-build-ubuntu-defaults'
-        - dovetail-parameter:
-            gs-pathname: '{gs-pathname}'
-            image: '{image}'
-            branch: '{branch}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - dovetail-parameter:
+          gs-pathname: '{gs-pathname}'
+          image: '{image}'
+          branch: '{branch}'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - 'dovetail-builder-artifacts-upload'
-        - 'dovetail-upload-artifacts-cache-cleanup'
-        - 'dovetail-images-cleanup'
+      - 'dovetail-builder-artifacts-upload'
+      - 'dovetail-upload-artifacts-cache-cleanup'
+      - 'dovetail-images-cleanup'
 
 ####################
 # parameter macros
@@ -66,49 +67,49 @@
 - parameter:
     name: dovetail-parameter
     parameters:
-        - string:
-            name: CACHE_DIR
-            default: $WORKSPACE/cache{gs-pathname}
-            description: "the cache to store packages downloaded"
-        - string:
-            name: STORE_URL
-            default: gs://artifacts.opnfv.org/dovetail{gs-pathname}
-            description: "LF artifacts url for storage of dovetail packages"
-        - string:
-            name: DOCKER_REPO_NAME
-            default: opnfv/{image}
-            description: "docker repo name"
-        - string:
-            name: DOCKER_TAG
-            default: latest
-            description: "docker image tag of which will be uploaded to artifacts"
-        - string:
-            name: STORE_FILE_NAME
-            default: image_{image}_{branch}_$BUILD_ID.docker
-            description: "stored file name"
+      - string:
+          name: CACHE_DIR
+          default: $WORKSPACE/cache{gs-pathname}
+          description: "the cache to store packages downloaded"
+      - string:
+          name: STORE_URL
+          default: gs://artifacts.opnfv.org/dovetail{gs-pathname}
+          description: "LF artifacts url for storage of dovetail packages"
+      - string:
+          name: DOCKER_REPO_NAME
+          default: opnfv/{image}
+          description: "docker repo name"
+      - string:
+          name: DOCKER_TAG
+          default: latest
+          description: "docker image tag of which will be uploaded to artifacts"
+      - string:
+          name: STORE_FILE_NAME
+          default: image_{image}_{branch}_$BUILD_ID.docker
+          description: "stored file name"
 
 ####################################
-#builders for dovetail project
+# builders for dovetail project
 ####################################
 - builder:
     name: dovetail-builder-artifacts-upload
     builders:
-        - shell:
-            !include-raw: ./dovetail-artifacts-upload.sh
+      - shell:
+          !include-raw: ./dovetail-artifacts-upload.sh
 
 - builder:
     name: dovetail-upload-artifacts-cache-cleanup
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
+      - shell: |
+          #!/bin/bash
+          set -o errexit
 
-            echo "Dovetail: cleanup cache used for storage downloaded packages"
+          echo "Dovetail: cleanup cache used for storage downloaded packages"
 
-            /bin/rm -rf $CACHE_DIR
+          /bin/rm -rf $CACHE_DIR
 
 - builder:
     name: dovetail-images-cleanup
     builders:
-        - shell:
-            !include-raw: ./dovetail-cleanup.sh
+      - shell:
+          !include-raw: ./dovetail-cleanup.sh
diff --git a/jjb/dovetail/dovetail-ci-jobs.yml b/jjb/dovetail/dovetail-ci-jobs.yml
index 94f38b193..9fde120f8 100644
--- a/jjb/dovetail/dovetail-ci-jobs.yml
+++ b/jjb/dovetail/dovetail-ci-jobs.yml
@@ -1,3 +1,4 @@
+---
 ###################################
 # job configuration for dovetail
 ###################################
@@ -6,179 +7,179 @@
 
     project: '{name}'
 
-#---------------------------------------
-# BRANCH ANCHORS
-#---------------------------------------
-# 1)the stream/branch here represents the SUT(System Under Test) stream/branch
-# 2)docker-tag is the docker tag of dovetail(only master by now, then all latest used)
-#   the dovetail stream is one-to-one mapping with dovetail docker-tag
-#   the dovetail is not sync with A/B/C release
-#
+    # --------------------------------------
+    # BRANCH ANCHORS
+    # --------------------------------------
+    # 1)the stream/branch here represents the SUT(System Under Test) stream/branch
+    # 2)docker-tag is the docker tag of dovetail(only master by now, then all latest used)
+    #   the dovetail stream is one-to-one mapping with dovetail docker-tag
+    #   the dovetail is not sync with A/B/C release
     master: &master
-        stream: master
-        branch: '{stream}'
-        dovetail-branch: '{stream}'
-        gs-pathname: ''
-        docker-tag: 'latest'
+      stream: master
+      branch: '{stream}'
+      dovetail-branch: '{stream}'
+      gs-pathname: ''
+      docker-tag: 'latest'
     danube: &danube
-        stream: danube
-        branch: 'stable/{stream}'
-        dovetail-branch: master
-        gs-pathname: '/{stream}'
-        docker-tag: 'cvp.0.7.0'
+      stream: danube
+      branch: 'stable/{stream}'
+      dovetail-branch: master
+      gs-pathname: '/{stream}'
+      docker-tag: 'cvp.0.7.0'
 
-#-----------------------------------
-# POD, PLATFORM, AND BRANCH MAPPING
-#-----------------------------------
-#            CI PODs
-# This section should only contain the SUTs
-# that have been switched using labels for slaves
-#------------------------------------------------
-# the pods, SUTs listed here are just examples to
-# let the dovetail tool run, there can be more ways beside CI to
-# run the dovetail tool.
-# pods, SUTs will be added/adjusted when needed
+    # ----------------------------------
+    # POD, PLATFORM, AND BRANCH MAPPING
+    # ----------------------------------
+    #            CI PODs
+    # This section should only contain the SUTs
+    # that have been switched using labels for slaves
+    # -----------------------------------------------
+    # the pods, SUTs listed here are just examples to
+    # let the dovetail tool run, there can be more ways beside CI to
+    # run the dovetail tool.
+    # pods, SUTs will be added/adjusted when needed
     pod:
-# fuel CI PODs
-        - baremetal:
-            slave-label: fuel-baremetal
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - virtual:
-            slave-label: fuel-virtual
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - baremetal:
-            slave-label: fuel-baremetal
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - virtual:
-            slave-label: fuel-virtual
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-#compass CI PODs
-        - baremetal:
-            slave-label: compass-baremetal
-            SUT: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - virtual:
-            slave-label: compass-virtual
-            SUT: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - baremetal:
-            slave-label: compass-baremetal
-            SUT: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - virtual:
-            slave-label: compass-virtual
-            SUT: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-#--------------------------------
-#    Installers not using labels
-#            CI PODs
-# This section should only contain the installers
-# that have not been switched using labels for slaves
-#--------------------------------
-#apex PODs
-        - virtual:
-            slave-label: apex-virtual-master
-            SUT: apex
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - baremetal:
-            slave-label: apex-baremetal-master
-            SUT: apex
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - virtual:
-            slave-label: apex-virtual-danube
-            SUT: apex
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - baremetal:
-            slave-label: apex-baremetal-danube
-            SUT: apex
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-#armband CI PODs
-        - armband-baremetal:
-            slave-label: armband-baremetal
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - armband-virtual:
-            slave-label: armband-virtual
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - armband-baremetal:
-            slave-label: armband-baremetal
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - armband-virtual:
-            slave-label: armband-virtual
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-#--------------------------------
-#        None-CI PODs
-#--------------------------------
-        - baremetal-centos:
-            slave-label: 'intel-pod8'
-            SUT: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - zte-pod1:
-            slave-label: zte-pod1
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - zte-pod2:
-            slave-label: zte-pod2
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - zte-pod3:
-            slave-label: zte-pod3
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *master
-        - zte-pod1:
-            slave-label: zte-pod1
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - zte-pod3:
-            slave-label: zte-pod3
-            SUT: fuel
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - huawei-pod4:
-            slave-label: huawei-pod4
-            SUT: apex
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-        - huawei-pod7:
-            slave-label: huawei-pod7
-            SUT: compass
-            auto-trigger-name: 'daily-trigger-disabled'
-            <<: *danube
-#--------------------------------
+      # fuel CI PODs
+      - baremetal:
+          slave-label: fuel-baremetal
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - virtual:
+          slave-label: fuel-virtual
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - baremetal:
+          slave-label: fuel-baremetal
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      - virtual:
+          slave-label: fuel-virtual
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      # compass CI PODs
+      - baremetal:
+          slave-label: compass-baremetal
+          SUT: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - virtual:
+          slave-label: compass-virtual
+          SUT: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - baremetal:
+          slave-label: compass-baremetal
+          SUT: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      - virtual:
+          slave-label: compass-virtual
+          SUT: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      # -------------------------------
+      #    Installers not using labels
+      #            CI PODs
+      # This section should only contain the installers
+      # that have not been switched using labels for slaves
+      # -------------------------------
+      # apex PODs
+      - virtual:
+          slave-label: apex-virtual-master
+          SUT: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - baremetal:
+          slave-label: apex-baremetal-master
+          SUT: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - virtual:
+          slave-label: apex-virtual-danube
+          SUT: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      - baremetal:
+          slave-label: apex-baremetal-danube
+          SUT: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      # armband CI PODs
+      - armband-baremetal:
+          slave-label: armband-baremetal
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - armband-virtual:
+          slave-label: armband-virtual
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - armband-baremetal:
+          slave-label: armband-baremetal
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      - armband-virtual:
+          slave-label: armband-virtual
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      # -------------------------------
+      #        None-CI PODs
+      # -------------------------------
+      - baremetal-centos:
+          slave-label: 'intel-pod8'
+          SUT: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - zte-pod1:
+          slave-label: zte-pod1
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - zte-pod2:
+          slave-label: zte-pod2
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - zte-pod3:
+          slave-label: zte-pod3
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
+      - zte-pod1:
+          slave-label: zte-pod1
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      - zte-pod3:
+          slave-label: zte-pod3
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      - huawei-pod4:
+          slave-label: huawei-pod4
+          SUT: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+      - huawei-pod7:
+          slave-label: huawei-pod7
+          SUT: compass
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *danube
+
+    # -------------------------------
     testsuite:
-        - 'compliance_set'
-        - 'proposed_tests'
+      - 'compliance_set'
+      - 'proposed_tests'
 
     jobs:
-        - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}'
+      - 'dovetail-{SUT}-{pod}-{testsuite}-{stream}'
 
 ################################
 # job templates
@@ -191,80 +192,80 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 300
-            abort: true
-        - fix-workspace-permissions
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: 300
+          abort: true
+      - fix-workspace-permissions
 
     triggers:
-        - '{auto-trigger-name}'
+      - '{auto-trigger-name}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{dovetail-branch}'
-        - '{SUT}-defaults'
-        - '{slave-label}-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull dovetail docker image'
-        - string:
-            name: CI_DEBUG
-            default: 'true'
-            description: "Show debug output information"
-        - string:
-            name: TESTSUITE
-            default: '{testsuite}'
-            description: "dovetail testsuite to run"
-        - string:
-            name: DOVETAIL_REPO_DIR
-            default: "/home/opnfv/dovetail"
-            description: "Directory where the dovetail repository is cloned"
-        - string:
-            name: SUT_BRANCH
-            default: '{branch}'
-            description: "SUT branch"
+      - project-parameter:
+          project: '{project}'
+          branch: '{dovetail-branch}'
+      - '{SUT}-defaults'
+      - '{slave-label}-defaults'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: 'Tag to pull dovetail docker image'
+      - string:
+          name: CI_DEBUG
+          default: 'true'
+          description: "Show debug output information"
+      - string:
+          name: TESTSUITE
+          default: '{testsuite}'
+          description: "dovetail testsuite to run"
+      - string:
+          name: DOVETAIL_REPO_DIR
+          default: "/home/opnfv/dovetail"
+          description: "Directory where the dovetail repository is cloned"
+      - string:
+          name: SUT_BRANCH
+          default: '{branch}'
+          description: "SUT branch"
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - 'dovetail-cleanup'
-        - 'dovetail-run'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - 'dovetail-cleanup'
+      - 'dovetail-run'
 
     publishers:
-        - archive:
-            artifacts: 'results/**/*'
-            allow-empty: true
-            fingerprint: true
-        - email-jenkins-admins-on-failure
+      - archive:
+          artifacts: 'results/**/*'
+          allow-empty: true
+          fingerprint: true
+      - email-jenkins-admins-on-failure
 
-#--------------------------
+# -------------------------
 # builder macros
-#--------------------------
+# -------------------------
 - builder:
     name: dovetail-run
     builders:
-        - shell:
-            !include-raw: ./dovetail-run.sh
+      - shell:
+          !include-raw: ./dovetail-run.sh
 
 - builder:
     name: dovetail-cleanup
     builders:
-        - shell:
-            !include-raw: ./dovetail-cleanup.sh
+      - shell:
+          !include-raw: ./dovetail-cleanup.sh
diff --git a/jjb/dovetail/dovetail-project-jobs.yml b/jjb/dovetail/dovetail-project-jobs.yml
index 9dc4808b4..c38ec9637 100644
--- a/jjb/dovetail/dovetail-project-jobs.yml
+++ b/jjb/dovetail/dovetail-project-jobs.yml
@@ -1,3 +1,4 @@
+---
 ###################################################
 # Non-ci jobs for Dovetail project
 # They will only be enabled on request by projects!
@@ -8,13 +9,13 @@
     project: 'dovetail'
 
     jobs:
-        - 'dovetail-verify-{stream}'
-        - 'dovetail-merge-{stream}'
+      - 'dovetail-verify-{stream}'
+      - 'dovetail-merge-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          disabled: false
 
 ################################
 # job templates
@@ -26,35 +27,35 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     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}'
+      - 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}'
     builders:
-        - dovetail-unit-tests
+      - dovetail-unit-tests
 
 - job-template:
     name: 'dovetail-merge-{stream}'
@@ -62,50 +63,50 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/{branch}'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
 
     builders:
-        - dovetail-unit-tests
+      - dovetail-unit-tests
 
 ################################
-#builders for dovetail project
+# builders for dovetail project
 ###############################
 - builder:
     name: dovetail-hello-world
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
+      - shell: |
+          #!/bin/bash
+          set -o errexit
 
-            echo "hello world"
+          echo "hello world"
 
 
 - builder:
     name: dovetail-unit-tests
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
 
-            tox
+          tox
diff --git a/jjb/dovetail/dovetail-weekly-jobs.yml b/jjb/dovetail/dovetail-weekly-jobs.yml
index 11904cbcd..5a162bb7f 100644
--- a/jjb/dovetail/dovetail-weekly-jobs.yml
+++ b/jjb/dovetail/dovetail-weekly-jobs.yml
@@ -1,59 +1,60 @@
+---
 - project:
     name: dovetail-weekly-jobs
     project: dovetail
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        dovetail-branch: '{stream}'
-        gs-pathname: ''
-        docker-tag: 'latest'
+      stream: master
+      branch: '{stream}'
+      dovetail-branch: '{stream}'
+      gs-pathname: ''
+      docker-tag: 'latest'
     danube: &danube
-        stream: danube
-        branch: 'stable/{stream}'
-        dovetail-branch: master
-        gs-pathname: '/{stream}'
-        docker-tag: 'latest'
+      stream: danube
+      branch: 'stable/{stream}'
+      dovetail-branch: master
+      gs-pathname: '/{stream}'
+      docker-tag: 'latest'
 
-#--------------------------------
-# POD, INSTALLER, AND BRANCH MAPPING
-#--------------------------------
-#    Installers using labels
-#            CI PODs
-# This section should only contain the installers
-# that have been switched using labels for slaves
-#--------------------------------
+    # -------------------------------
+    # POD, INSTALLER, AND BRANCH MAPPING
+    # -------------------------------
+    #    Installers using labels
+    #            CI PODs
+    # This section should only contain the installers
+    # that have been switched using labels for slaves
+    # -------------------------------
     pod:
-#        - baremetal:
-#            slave-label: apex-baremetal
-#            SUT: apex
-#            <<: *danube
-        - baremetal:
-            slave-label: compass-baremetal
-            SUT: compass
-            <<: *danube
-#        - baremetal:
-#            slave-label: fuel-baremetal
-#            SUT: fuel
-#            <<: *danube
-#        - baremetal:
-#            slave-label: joid-baremetal
-#            SUT: joid
-#            <<: *danube
+      # - baremetal:
+      #     slave-label: apex-baremetal
+      #     SUT: apex
+      #     <<: *danube
+      - baremetal:
+          slave-label: compass-baremetal
+          SUT: compass
+          <<: *danube
+    # - baremetal:
+    #     slave-label: fuel-baremetal
+    #     SUT: fuel
+    #     <<: *danube
+    # - baremetal:
+    #     slave-label: joid-baremetal
+    #     SUT: joid
+    #     <<: *danube
 
     testsuite:
-        - 'debug'
-        - 'compliance_set'
-        - 'proposed_tests'
+      - 'debug'
+      - 'compliance_set'
+      - 'proposed_tests'
 
     loop:
-        - 'weekly':
-            job-timeout: 180
+      - 'weekly':
+          job-timeout: 180
 
     jobs:
-        - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
+      - 'dovetail-{SUT}-{pod}-{testsuite}-{loop}-{stream}'
 
 ################################
 # job template
@@ -66,61 +67,61 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: '{job-timeout}'
-            abort: true
-        - fix-workspace-permissions
+      - build-name:
+          name: '$BUILD_NUMBER Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: '{job-timeout}'
+          abort: true
+      - fix-workspace-permissions
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{dovetail-branch}'
-        - '{SUT}-defaults'
-        - '{slave-label}-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull dovetail docker image'
-        - string:
-            name: CI_DEBUG
-            default: 'true'
-            description: "Show debug output information"
-        - string:
-            name: TESTSUITE
-            default: '{testsuite}'
-            description: "dovetail testsuite to run"
-        - string:
-            name: DOVETAIL_REPO_DIR
-            default: "/home/opnfv/dovetail"
-            description: "Directory where the dovetail repository is cloned"
+      - project-parameter:
+          project: '{project}'
+          branch: '{dovetail-branch}'
+      - '{SUT}-defaults'
+      - '{slave-label}-defaults'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: 'Tag to pull dovetail docker image'
+      - string:
+          name: CI_DEBUG
+          default: 'true'
+          description: "Show debug output information"
+      - string:
+          name: TESTSUITE
+          default: '{testsuite}'
+          description: "dovetail testsuite to run"
+      - string:
+          name: DOVETAIL_REPO_DIR
+          default: "/home/opnfv/dovetail"
+          description: "Directory where the dovetail repository is cloned"
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - 'dovetail-cleanup'
-        - 'dovetail-run'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - 'dovetail-cleanup'
+      - 'dovetail-run'
 
     publishers:
-        - archive:
-            artifacts: 'results/**/*'
-            allow-empty: true
-            fingerprint: true
-        - email-jenkins-admins-on-failure
+      - archive:
+          artifacts: 'results/**/*'
+          allow-empty: true
+          fingerprint: true
+      - email-jenkins-admins-on-failure
 
 ########################
 # builder macros
@@ -128,10 +129,11 @@
 - builder:
     name: dovetail-run-weekly
     builders:
-        - shell:
-            !include-raw: ./dovetail-run.sh
+      - shell:
+          !include-raw: ./dovetail-run.sh
+
 - builder:
     name: dovetail-cleanup-weekly
     builders:
-        - shell:
-            !include-raw: ./dovetail-cleanup.sh
+      - shell:
+          !include-raw: ./dovetail-cleanup.sh