Fix Yamllint violations for jjb/functest

JIRA: RELENG-254

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

3 files changed, 638 insertions, 616 deletions

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 04a293618..bddb2777b 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -1,3 +1,4 @@
+---
 ###################################
 # job configuration for functest
 ###################################
@@ -6,210 +7,210 @@
 
     project: functest
 
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        gs-pathname: ''
-        docker-tag: 'latest'
+      stream: master
+      branch: '{stream}'
+      gs-pathname: ''
+      docker-tag: 'latest'
     euphrates: &euphrates
-        stream: euphrates
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
-        docker-tag: 'stable'
-#--------------------------------
-# 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
-#--------------------------------
+      stream: euphrates
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+      docker-tag: 'stable'
+    # -------------------------------
+    # 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:
-# fuel CI PODs
-        - baremetal:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *master
-        - virtual:
-            slave-label: fuel-virtual
-            installer: fuel
-            <<: *master
-        - baremetal:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *euphrates
-        - virtual:
-            slave-label: fuel-virtual
-            installer: fuel
-            <<: *euphrates
-# joid CI PODs
-        - baremetal:
-            slave-label: joid-baremetal
-            installer: joid
-            <<: *master
-        - virtual:
-            slave-label: joid-virtual
-            installer: joid
-            <<: *master
-        - baremetal:
-            slave-label: joid-baremetal
-            installer: joid
-            <<: *euphrates
-        - virtual:
-            slave-label: joid-virtual
-            installer: joid
-            <<: *euphrates
-# compass CI PODs
-        - baremetal:
-            slave-label: compass-baremetal
-            installer: compass
-            <<: *master
-        - virtual:
-            slave-label: compass-virtual
-            installer: compass
-            <<: *master
-        - baremetal:
-            slave-label: compass-baremetal
-            installer: compass
-            <<: *euphrates
-        - virtual:
-            slave-label: compass-virtual
-            installer: compass
-            <<: *euphrates
-# apex CI PODs
-        - virtual:
-            slave-label: apex-virtual-master
-            installer: apex
-            <<: *master
-        - baremetal:
-            slave-label: apex-baremetal-master
-            installer: apex
-            <<: *master
-        - virtual:
-            slave-label: apex-virtual-euphrates
-            installer: apex
-            <<: *euphrates
-        - baremetal:
-            slave-label: apex-baremetal-euphrates
-            installer: apex
-            <<: *euphrates
-# armband CI PODs
-        - armband-baremetal:
-            slave-label: armband-baremetal
-            installer: fuel
-            <<: *master
-        - armband-virtual:
-            slave-label: armband-virtual
-            installer: fuel
-            <<: *master
-        - armband-baremetal:
-            slave-label: armband-baremetal
-            installer: fuel
-            <<: *euphrates
-        - armband-virtual:
-            slave-label: armband-virtual
-            installer: fuel
-            <<: *euphrates
-# daisy CI PODs
-        - baremetal:
-            slave-label: daisy-baremetal
-            installer: daisy
-            <<: *master
-        - virtual:
-            slave-label: daisy-virtual
-            installer: daisy
-            <<: *master
-        - baremetal:
-            slave-label: daisy-baremetal
-            installer: daisy
-            <<: *euphrates
-        - virtual:
-            slave-label: daisy-virtual
-            installer: daisy
-            <<: *euphrates
-# netvirt 3rd party ci
-        - virtual:
-            slave-label: odl-netvirt-virtual
-            installer: netvirt
-            <<: *master
-#--------------------------------
-#        None-CI PODs
-#--------------------------------
-        - orange-pod1:
-            slave-label: '{pod}'
-            installer: joid
-            <<: *master
-        - orange-pod5:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *master
-        - orange-pod2:
-            slave-label: '{pod}'
-            installer: joid
-            <<: *master
-        - baremetal-centos:
-            slave-label: 'intel-pod8'
-            installer: compass
-            <<: *master
-        - nokia-pod1:
-            slave-label: '{pod}'
-            installer: apex
-            <<: *master
-        - zte-pod1:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *master
-        - zte-pod1:
-            slave-label: '{pod}'
-            installer: fuel
-            <<: *euphrates
-        - zte-pod2:
-            slave-label: '{pod}'
-            installer: daisy
-            <<: *master
-        - zte-pod2:
-            slave-label: '{pod}'
-            installer: daisy
-            <<: *euphrates
-        - zte-pod3:
-            slave-label: '{pod}'
-            installer: daisy
-            <<: *master
-        - zte-pod3:
-            slave-label: '{pod}'
-            installer: daisy
-            <<: *euphrates
-# PODs for verify jobs triggered by each patch upload
-#        - ool-virtual1:
-#            slave-label: '{pod}'
-#            installer: apex
-#            <<: *master
-#--------------------------------
+      # fuel CI PODs
+      - baremetal:
+          slave-label: fuel-baremetal
+          installer: fuel
+          <<: *master
+      - virtual:
+          slave-label: fuel-virtual
+          installer: fuel
+          <<: *master
+      - baremetal:
+          slave-label: fuel-baremetal
+          installer: fuel
+          <<: *euphrates
+      - virtual:
+          slave-label: fuel-virtual
+          installer: fuel
+          <<: *euphrates
+      # joid CI PODs
+      - baremetal:
+          slave-label: joid-baremetal
+          installer: joid
+          <<: *master
+      - virtual:
+          slave-label: joid-virtual
+          installer: joid
+          <<: *master
+      - baremetal:
+          slave-label: joid-baremetal
+          installer: joid
+          <<: *euphrates
+      - virtual:
+          slave-label: joid-virtual
+          installer: joid
+          <<: *euphrates
+      # compass CI PODs
+      - baremetal:
+          slave-label: compass-baremetal
+          installer: compass
+          <<: *master
+      - virtual:
+          slave-label: compass-virtual
+          installer: compass
+          <<: *master
+      - baremetal:
+          slave-label: compass-baremetal
+          installer: compass
+          <<: *euphrates
+      - virtual:
+          slave-label: compass-virtual
+          installer: compass
+          <<: *euphrates
+      # apex CI PODs
+      - virtual:
+          slave-label: apex-virtual-master
+          installer: apex
+          <<: *master
+      - baremetal:
+          slave-label: apex-baremetal-master
+          installer: apex
+          <<: *master
+      - virtual:
+          slave-label: apex-virtual-euphrates
+          installer: apex
+          <<: *euphrates
+      - baremetal:
+          slave-label: apex-baremetal-euphrates
+          installer: apex
+          <<: *euphrates
+      # armband CI PODs
+      - armband-baremetal:
+          slave-label: armband-baremetal
+          installer: fuel
+          <<: *master
+      - armband-virtual:
+          slave-label: armband-virtual
+          installer: fuel
+          <<: *master
+      - armband-baremetal:
+          slave-label: armband-baremetal
+          installer: fuel
+          <<: *euphrates
+      - armband-virtual:
+          slave-label: armband-virtual
+          installer: fuel
+          <<: *euphrates
+      # daisy CI PODs
+      - baremetal:
+          slave-label: daisy-baremetal
+          installer: daisy
+          <<: *master
+      - virtual:
+          slave-label: daisy-virtual
+          installer: daisy
+          <<: *master
+      - baremetal:
+          slave-label: daisy-baremetal
+          installer: daisy
+          <<: *euphrates
+      - virtual:
+          slave-label: daisy-virtual
+          installer: daisy
+          <<: *euphrates
+      # netvirt 3rd party ci
+      - virtual:
+          slave-label: odl-netvirt-virtual
+          installer: netvirt
+          <<: *master
+      # -------------------------------
+      #        None-CI PODs
+      # -------------------------------
+      - orange-pod1:
+          slave-label: '{pod}'
+          installer: joid
+          <<: *master
+      - orange-pod5:
+          slave-label: '{pod}'
+          installer: fuel
+          <<: *master
+      - orange-pod2:
+          slave-label: '{pod}'
+          installer: joid
+          <<: *master
+      - baremetal-centos:
+          slave-label: 'intel-pod8'
+          installer: compass
+          <<: *master
+      - nokia-pod1:
+          slave-label: '{pod}'
+          installer: apex
+          <<: *master
+      - zte-pod1:
+          slave-label: '{pod}'
+          installer: fuel
+          <<: *master
+      - zte-pod1:
+          slave-label: '{pod}'
+          installer: fuel
+          <<: *euphrates
+      - zte-pod2:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *master
+      - zte-pod2:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *euphrates
+      - zte-pod3:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *master
+      - zte-pod3:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *euphrates
+    # PODs for verify jobs triggered by each patch upload
+    #   - ool-virtual1:
+    #       slave-label: '{pod}'
+    #       installer: apex
+    #       <<: *master
+    # -------------------------------
 
     alpine-pod:
-        - ericsson-virtual-pod1bl01:
-            slave-label: '{alpine-pod}'
-            installer: fuel
-            <<: *master
-        - huawei-virtual5:
-            slave-label: '{alpine-pod}'
-            installer: compass
-            <<: *master
+      - ericsson-virtual-pod1bl01:
+          slave-label: '{alpine-pod}'
+          installer: fuel
+          <<: *master
+      - huawei-virtual5:
+          slave-label: '{alpine-pod}'
+          installer: compass
+          <<: *master
 
     testsuite:
-        - 'suite':
-            job-timeout: 60
-        - 'daily':
-            job-timeout: 240
-        - 'arm-daily':
-            job-timeout: 240
+      - 'suite':
+          job-timeout: 60
+      - 'daily':
+          job-timeout: 240
+      - 'arm-daily':
+          job-timeout: 240
 
     jobs:
-        - 'functest-{installer}-{pod}-{testsuite}-{stream}'
-        - 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
+      - 'functest-{installer}-{pod}-{testsuite}-{stream}'
+      - 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
 
 ################################
 # job template
@@ -220,47 +221,47 @@
     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 Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: '{job-timeout}'
-            abort: true
+      - build-name:
+          name: '$BUILD_NUMBER Suite: $FUNCTEST_MODE Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: '{job-timeout}'
+          abort: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults'
-        - 'functest-{testsuite}-parameter'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull docker image'
-        - string:
-            name: CLEAN_DOCKER_IMAGES
-            default: 'false'
-            description: 'Remove downloaded docker images (opnfv/functest*:*)'
-        - functest-parameter:
-            gs-pathname: '{gs-pathname}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults'
+      - 'functest-{testsuite}-parameter'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-odl_l2-nofeature-ha'
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: 'Tag to pull docker image'
+      - string:
+          name: CLEAN_DOCKER_IMAGES
+          default: 'false'
+          description: 'Remove downloaded docker images (opnfv/functest*:*)'
+      - functest-parameter:
+          gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - 'functest-{testsuite}-builder'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - 'functest-{testsuite}-builder'
 
 - job-template:
     name: 'functest-alpine-{installer}-{alpine-pod}-{testsuite}-{stream}'
@@ -268,39 +269,39 @@
     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 Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: '{job-timeout}'
-            abort: true
+      - build-name:
+          name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: '{job-timeout}'
+          abort: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults'
-        - 'functest-{testsuite}-parameter'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-noha'
-        - functest-parameter:
-            gs-pathname: '{gs-pathname}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults'
+      - 'functest-{testsuite}-parameter'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-noha'
+      - functest-parameter:
+          gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - 'functest-alpine-daily-builder'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - 'functest-alpine-daily-builder'
 
 ########################
 # parameter macros
@@ -308,188 +309,199 @@
 - parameter:
     name: functest-daily-parameter
     parameters:
-        - string:
-            name: FUNCTEST_MODE
-            default: 'daily'
-            description: "Daily suite name to run"
+      - string:
+          name: FUNCTEST_MODE
+          default: 'daily'
+          description: "Daily suite name to run"
+
 - parameter:
     name: functest-arm-daily-parameter
     parameters:
-        - string:
-            name: FUNCTEST_MODE
-            default: 'arm-daily'
-            description: "Daily suite name (Aarch64) to run"
+      - string:
+          name: FUNCTEST_MODE
+          default: 'arm-daily'
+          description: "Daily suite name (Aarch64) to run"
+
 - parameter:
     name: functest-suite-parameter
     parameters:
-        - choice:
-            name: FUNCTEST_MODE
-            choices:
-                - 'tier'
-                - 'testcase'
-            default: 'tier'
-            description: "Test case or Tier to be run"
-        - choice:
-            name: FUNCTEST_SUITE_NAME
-            choices:
-                - 'connection_check'
-                - 'api_check'
-                - 'snaps_health_check'
-                - 'vping_userdata'
-                - 'vping_ssh'
-                - 'tempest_smoke_serial'
-                - 'rally_sanity'
-                - 'odl'
-                - 'odl_netvirt'
-                - 'snaps_smoke'
-                - 'refstack_defcore'
-                - 'promise'
-                - 'doctor'
-                - 'bgpvpn'
-                - 'parser'
-                - 'security_scan'
-                - 'tempest_full_parallel'
-                - 'rally_full'
-                - 'cloudify_ims'
-                - 'cloudify_vrouter'
-                - 'orchestra_openims'
-                - 'orchestra_clearwaterims'
-            default: 'connection_check'
-        - choice:
-            name: FUNCTEST_TIER
-            choices:
-                - 'healthcheck'
-                - 'smoke'
-                - 'features'
-                - 'components'
-                - 'vnf'
-            default: 'healthcheck'
-        - string:
-            name: TESTCASE_OPTIONS
-            default: ''
-            description: 'Additional parameters specific to test case(s)'
+      - choice:
+          name: FUNCTEST_MODE
+          choices:
+            - 'tier'
+            - 'testcase'
+          default: 'tier'
+          description: "Test case or Tier to be run"
+      - choice:
+          name: FUNCTEST_SUITE_NAME
+          choices:
+            - 'connection_check'
+            - 'api_check'
+            - 'snaps_health_check'
+            - 'vping_userdata'
+            - 'vping_ssh'
+            - 'tempest_smoke_serial'
+            - 'rally_sanity'
+            - 'odl'
+            - 'odl_netvirt'
+            - 'snaps_smoke'
+            - 'refstack_defcore'
+            - 'promise'
+            - 'doctor'
+            - 'bgpvpn'
+            - 'parser'
+            - 'security_scan'
+            - 'tempest_full_parallel'
+            - 'rally_full'
+            - 'cloudify_ims'
+            - 'cloudify_vrouter'
+            - 'orchestra_openims'
+            - 'orchestra_clearwaterims'
+          default: 'connection_check'
+      - choice:
+          name: FUNCTEST_TIER
+          choices:
+            - 'healthcheck'
+            - 'smoke'
+            - 'features'
+            - 'components'
+            - 'vnf'
+          default: 'healthcheck'
+      - string:
+          name: TESTCASE_OPTIONS
+          default: ''
+          description: 'Additional parameters specific to test case(s)'
+
 - parameter:
     name: functest-parameter
     parameters:
-        - string:
-            name: GS_PATHNAME
-            default: '{gs-pathname}'
-            description: "Version directory where the opnfv documents will be stored in gs repository"
-        - string:
-            name: FUNCTEST_REPO_DIR
-            default: "/home/opnfv/repos/functest"
-            description: "Directory where the Functest repository is cloned"
-        - string:
-            name: PUSH_RESULTS_TO_DB
-            default: "true"
-            description: "Push the results of all the tests to the resultDB"
-        - string:
-            name: CI_DEBUG
-            default: 'false'
-            description: "Show debug output information"
-        - string:
-            name: RC_FILE_PATH
-            default: ''
-            description: "Path to the OS credentials file if given"
+      - string:
+          name: GS_PATHNAME
+          default: '{gs-pathname}'
+          description: "Version directory where the opnfv documents will be stored in gs repository"
+      - string:
+          name: FUNCTEST_REPO_DIR
+          default: "/home/opnfv/repos/functest"
+          description: "Directory where the Functest repository is cloned"
+      - string:
+          name: PUSH_RESULTS_TO_DB
+          default: "true"
+          description: "Push the results of all the tests to the resultDB"
+      - string:
+          name: CI_DEBUG
+          default: 'false'
+          description: "Show debug output information"
+      - string:
+          name: RC_FILE_PATH
+          default: ''
+          description: "Path to the OS credentials file if given"
 ########################
 # trigger macros
 ########################
 - trigger:
     name: 'functest-master'
     triggers:
-        - pollscm:
-            cron: "H 9 * * *"
+      - pollscm:
+          cron: "H 9 * * *"
 ########################
 # builder macros
 ########################
 - builder:
     name: functest-daily-builder
     builders:
-        - 'functest-cleanup'
-        - 'functest-daily'
-        - 'functest-store-results'
-        - 'functest-exit'
+      - 'functest-cleanup'
+      - 'functest-daily'
+      - 'functest-store-results'
+      - 'functest-exit'
 
 - builder:
     name: functest-arm-daily-builder
     builders:
-        - 'functest-cleanup'
-        - 'set-functest-env'
-        - 'functest-arm-daily'
-        - 'functest-store-results'
-        - 'functest-exit'
+      - 'functest-cleanup'
+      - 'set-functest-env'
+      - 'functest-arm-daily'
+      - 'functest-store-results'
+      - 'functest-exit'
 
 - builder:
     name: functest-suite-builder
     builders:
-        - 'functest-cleanup'
-        - 'set-functest-env-alpine'
-        - 'functest-suite'
-        - 'functest-store-results'
-        - 'functest-exit'
+      - 'functest-cleanup'
+      - 'set-functest-env-alpine'
+      - 'functest-suite'
+      - 'functest-store-results'
+      - 'functest-exit'
 
 - builder:
     name: functest-alpine-daily-builder
     builders:
-        - 'functest-cleanup'
-        - 'set-functest-env-alpine'
-        - 'functest-daily'
-        - 'functest-store-results'
-        - 'functest-exit'
+      - 'functest-cleanup'
+      - 'set-functest-env-alpine'
+      - 'functest-daily'
+      - 'functest-store-results'
+      - 'functest-exit'
 
 - builder:
     name: functest-daily
     builders:
-        - shell:
-            !include-raw:
-                - ./functest-env-presetup.sh
-                - ../../utils/fetch_os_creds.sh
-                - ./functest-alpine.sh
+      # yamllint disable rule:indentation
+      - shell:
+          !include-raw:
+              - ./functest-env-presetup.sh
+              - ../../utils/fetch_os_creds.sh
+              - ./functest-alpine.sh
 
+# yamllint enable rule:indentation
 - builder:
     name: functest-arm-daily
     builders:
-        - shell:
-            !include-raw: ./functest-loop.sh
+      - shell:
+          !include-raw: ./functest-loop.sh
 
 - builder:
     name: functest-suite
     builders:
-        - shell:
-            !include-raw:
-                - ./functest-alpine.sh
+      # yamllint disable rule:indentation
+      - shell:
+          !include-raw:
+              - ./functest-alpine.sh
 
+# yamllint enable rule:indentation
 - builder:
     name: set-functest-env
     builders:
-        - shell:
-            !include-raw:
-                - ./functest-env-presetup.sh
-                - ../../utils/fetch_os_creds.sh
-                - ./set-functest-env.sh
+      # yamllint disable rule:indentation
+      - shell:
+          !include-raw:
+              - ./functest-env-presetup.sh
+              - ../../utils/fetch_os_creds.sh
+              - ./set-functest-env.sh
 
+# yamllint enable rule:indentation
 - builder:
     name: set-functest-env-alpine
     builders:
-        - shell:
-            !include-raw:
-                - ./functest-env-presetup.sh
-                - ../../utils/fetch_os_creds.sh
+      # yamllint disable rule:indentation
+      - shell:
+          !include-raw:
+              - ./functest-env-presetup.sh
+              - ../../utils/fetch_os_creds.sh
 
+# yamllint enable rule:indentation
 - builder:
     name: functest-store-results
     builders:
-        - shell:
-            !include-raw: ../../utils/push-test-logs.sh
+      - shell:
+          !include-raw: ../../utils/push-test-logs.sh
 
 - builder:
     name: functest-cleanup
     builders:
-        - shell:
-            !include-raw: ./functest-cleanup.sh
+      - shell:
+          !include-raw: ./functest-cleanup.sh
 
 - builder:
     name: functest-exit
     builders:
-        - shell:
-            !include-raw: ./functest-exit.sh
+      - shell:
+          !include-raw: ./functest-exit.sh
diff --git a/jjb/functest/functest-project-jobs.yml b/jjb/functest/functest-project-jobs.yml
index 329db5b7e..e068a4fee 100644
--- a/jjb/functest/functest-project-jobs.yml
+++ b/jjb/functest/functest-project-jobs.yml
@@ -1,3 +1,4 @@
+---
 ###################################################
 # All the jobs except verify have been removed!
 # They will only be enabled on request by projects!
@@ -8,27 +9,27 @@
     project: 'functest'
 
     jobs:
-        - 'functest-verify-{stream}'
-        - 'functest-verify-{phase}-{stream}'
-        - 'functest-docs-upload-{stream}'
+      - 'functest-verify-{stream}'
+      - 'functest-verify-{phase}-{stream}'
+      - 'functest-docs-upload-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - euphrates:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - euphrates:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
     phase:
-        - 'unit-tests-and-docs':
-            slave-label: 'opnfv-build-ubuntu'
-        - 'build-x86_64':
-            slave-label: 'opnfv-build-ubuntu'
-        - 'build-aarch64':
-            slave-label: 'opnfv-build-ubuntu-arm'
+      - 'unit-tests-and-docs':
+          slave-label: 'opnfv-build-ubuntu'
+      - 'build-x86_64':
+          slave-label: 'opnfv-build-ubuntu'
+      - 'build-aarch64':
+          slave-label: 'opnfv-build-ubuntu-arm'
 
 - job-template:
     name: 'functest-verify-{stream}'
@@ -38,64 +39,64 @@
     project-type: 'multijob'
 
     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:
-        - 'functest-verify-triggers-macro':
-            project: '{project}'
-            branch: '{branch}'
+      - 'functest-verify-triggers-macro':
+          project: '{project}'
+          branch: '{branch}'
 
     builders:
-        - shell: |
-            #!/bin/bash
-            # we do nothing here as the main stuff will be done
-            # in phase jobs
-            echo "Triggering phase jobs!"
-        - multijob:
-            name: 'functest-build-and-unittest'
-            execution-type: PARALLEL
-            projects:
-                - name: 'functest-verify-unit-tests-and-docs-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  git-revision: true
-                  node-parameters: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: false
-                - name: 'functest-verify-build-x86_64-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                    ARCH=x86_64
-                  git-revision: true
-                  node-parameters: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: false
-                - name: 'functest-verify-build-aarch64-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                    ARCH=aarch64
-                  git-revision: true
-                  node-parameters: false
-                  kill-phase-on: FAILURE
-                  abort-all-job: false
+      - shell: |
+          #!/bin/bash
+          # we do nothing here as the main stuff will be done
+          # in phase jobs
+          echo "Triggering phase jobs!"
+      - multijob:
+          name: 'functest-build-and-unittest'
+          execution-type: PARALLEL
+          projects:
+            - name: 'functest-verify-unit-tests-and-docs-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              git-revision: true
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: false
+            - name: 'functest-verify-build-x86_64-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                ARCH=x86_64
+              git-revision: true
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: false
+            - name: 'functest-verify-build-aarch64-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+                ARCH=aarch64
+              git-revision: true
+              node-parameters: false
+              kill-phase-on: FAILURE
+              abort-all-job: false
 
 - job-template:
     name: 'functest-verify-{phase}-{stream}'
@@ -103,24 +104,24 @@
     disabled: '{obj:disabled}'
 
     wrappers:
-        - ssh-agent-wrapper
-        - build-timeout:
-            timeout: 30
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 30
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{slave-label}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{slave-label}-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     builders:
-        - 'functest-verify-{phase}-builders-macro'
+      - 'functest-verify-{phase}-builders-macro'
 
     publishers:
-        - 'functest-verify-{phase}-publishers-macro'
+      - 'functest-verify-{phase}-publishers-macro'
 
 - job-template:
     name: 'functest-docs-upload-{stream}'
@@ -128,21 +129,21 @@
     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:
-        - 'functest-docs-upload-triggers-macro':
-            project: '{project}'
-            branch: '{branch}'
+      - 'functest-docs-upload-triggers-macro':
+          project: '{project}'
+          branch: '{branch}'
 
     builders:
-        - functest-upload-doc-artifact
+      - functest-upload-doc-artifact
 
 ################################
 # job triggers
@@ -150,47 +151,48 @@
 - trigger:
     name: 'functest-verify-triggers-macro'
     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}'
-                disable-strict-forbidden-file-verification: 'true'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+      - 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}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**|.gitignore'
+
 - trigger:
     name: 'functest-docs-upload-triggers-macro'
     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}'
-                disable-strict-forbidden-file-verification: 'true'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+      - 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}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**|.gitignore'
 ################################
 # job builders
 ################################
@@ -198,23 +200,26 @@
 - builder:
     name: 'functest-verify-unit-tests-and-docs-builders-macro'
     builders:
-        - shell: |
-            cd $WORKSPACE && tox
+      - shell: |
+          cd $WORKSPACE && tox
+
 - builder:
     name: 'functest-verify-build-x86_64-builders-macro'
     builders:
-        - shell: |
-            echo "Not activated!"
+      - shell: |
+          echo "Not activated!"
+
 - builder:
     name: 'functest-verify-build-aarch64-builders-macro'
     builders:
-        - shell: |
-            echo "Not activated!"
+      - shell: |
+          echo "Not activated!"
+
 - builder:
     name: 'functest-upload-doc-artifact'
     builders:
-        - shell: |
-            cd $WORKSPACE && tox -edocs
+      - shell: |
+          cd $WORKSPACE && tox -edocs
             wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs"
 ################################
 # job publishers
@@ -222,29 +227,31 @@
 - publisher:
     name: 'functest-verify-unit-tests-and-docs-publishers-macro'
     publishers:
-        - junit:
-            results: nosetests.xml
-        - cobertura:
-            report-file: "coverage.xml"
-            only-stable: "true"
-            health-auto-update: "true"
-            stability-auto-update: "true"
-            zoom-coverage-chart: "true"
-            targets:
-                - files:
-                    healthy: 10
-                    unhealthy: 20
-                    failing: 30
-                - method:
-                    healthy: 50
-                    unhealthy: 40
-                    failing: 30
-        - email-jenkins-admins-on-failure
+      - junit:
+          results: nosetests.xml
+      - cobertura:
+          report-file: "coverage.xml"
+          only-stable: "true"
+          health-auto-update: "true"
+          stability-auto-update: "true"
+          zoom-coverage-chart: "true"
+          targets:
+            - files:
+                healthy: 10
+                unhealthy: 20
+                failing: 30
+            - method:
+                healthy: 50
+                unhealthy: 40
+                failing: 30
+      - email-jenkins-admins-on-failure
+
 - publisher:
     name: 'functest-verify-build-x86_64-publishers-macro'
     publishers:
-        - email-jenkins-admins-on-failure
+      - email-jenkins-admins-on-failure
+
 - publisher:
     name: 'functest-verify-build-aarch64-publishers-macro'
     publishers:
-        - email-jenkins-admins-on-failure
+      - email-jenkins-admins-on-failure
diff --git a/jjb/functest/functest-weekly-jobs.yml b/jjb/functest/functest-weekly-jobs.yml
index fe331e03c..6826e4151 100644
--- a/jjb/functest/functest-weekly-jobs.yml
+++ b/jjb/functest/functest-weekly-jobs.yml
@@ -1,3 +1,4 @@
+---
 ###################################
 # job configuration for functest
 ###################################
@@ -6,50 +7,50 @@
 
     project: functest
 
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        gs-pathname: ''
-        docker-tag: 'latest'
-        disabled: false
+      stream: master
+      branch: '{stream}'
+      gs-pathname: ''
+      docker-tag: 'latest'
+      disabled: false
     euphrates: &euphrates
-        stream: euphrates
-        branch: 'stable/{stream}'
-        gs-pathname: '/{stream}'
-        docker-tag: 'stable'
-        disabled: false
-#--------------------------------
-# 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
-#--------------------------------
+      stream: euphrates
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+      docker-tag: 'stable'
+      disabled: false
+    # -------------------------------
+    # 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:
-# fuel CI PODs
-        - baremetal:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *master
-        - virtual:
-            slave-label: fuel-virtual
-            installer: fuel
-            <<: *master
-        - baremetal:
-            slave-label: fuel-baremetal
-            installer: fuel
-            <<: *euphrates
-        - virtual:
-            slave-label: fuel-virtual
-            installer: fuel
-            <<: *euphrates
-#--------------------------------
+      # fuel CI PODs
+      - baremetal:
+          slave-label: fuel-baremetal
+          installer: fuel
+          <<: *master
+      - virtual:
+          slave-label: fuel-virtual
+          installer: fuel
+          <<: *master
+      - baremetal:
+          slave-label: fuel-baremetal
+          installer: fuel
+          <<: *euphrates
+      - virtual:
+          slave-label: fuel-virtual
+          installer: fuel
+          <<: *euphrates
+    # -------------------------------
     jobs:
-        - 'functest-{installer}-{pod}-weekly-{stream}'
+      - 'functest-{installer}-{pod}-weekly-{stream}'
 
 ################################
 # job template
@@ -62,66 +63,68 @@
     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 Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: '400'
-            abort: true
+      - build-name:
+          name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: '400'
+          abort: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults'
-        - string:
-            name: FUNCTEST_SUITE_NAME
-            default: 'weekly'
-            description: "Weekly suite name to run"
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-nofeature-ha'
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull docker image'
-        - string:
-            name: CLEAN_DOCKER_IMAGES
-            default: 'false'
-            description: 'Remove downloaded docker images (opnfv/functest*:*)'
-        - functest-parameter:
-            gs-pathname: '{gs-pathname}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'weekly'
+          description: "Weekly suite name to run"
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-odl_l2-nofeature-ha'
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: 'Tag to pull docker image'
+      - string:
+          name: CLEAN_DOCKER_IMAGES
+          default: 'false'
+          description: 'Remove downloaded docker images (opnfv/functest*:*)'
+      - functest-parameter:
+          gs-pathname: '{gs-pathname}'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - 'functest-weekly-builder'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - 'functest-weekly-builder'
 ########################
 # builder macros
 ########################
 - builder:
     name: functest-weekly-builder
     builders:
-        - shell:
-            !include-raw: ./functest-cleanup.sh
-        - shell:
-            !include-raw:
-                - ./functest-env-presetup.sh
-                - ../../utils/fetch_os_creds.sh
-                - ./set-functest-env.sh
-        - shell:
-            !include-raw: ./functest-loop.sh
-        - shell:
-            !include-raw: ../../utils/push-test-logs.sh
-        - shell:
-            !include-raw: ./functest-exit.sh
+      - shell:
+          !include-raw: ./functest-cleanup.sh
+      # yamllint disable rule:indentation
+      - shell:
+          !include-raw:
+             - ./functest-env-presetup.sh
+             - ../../utils/fetch_os_creds.sh
+             - ./set-functest-env.sh
+      # yamllint enable rule:indentation
+      - shell:
+          !include-raw: ./functest-loop.sh
+      - shell:
+          !include-raw: ../../utils/push-test-logs.sh
+      - shell:
+          !include-raw: ./functest-exit.sh