Fix Yamllint violations for jjb/xci

JIRA: RELENG-254

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

6 files changed, 1044 insertions, 1024 deletions

diff --git a/jjb/xci/bifrost-cleanup-job.yml b/jjb/xci/bifrost-cleanup-job.yml
index 6f3f51a6d..f901afe74 100644
--- a/jjb/xci/bifrost-cleanup-job.yml
+++ b/jjb/xci/bifrost-cleanup-job.yml
@@ -1,28 +1,29 @@
+---
 - project:
     name: 'openstack-bifrost-cleanup'
-#--------------------------------
-# branches
-#--------------------------------
+    # -------------------------------
+    # branches
+    # -------------------------------
     stream:
-        - master:
-            branch: '{stream}'
+      - master:
+          branch: '{stream}'
 
-#--------------------------------
-# projects
-#--------------------------------
+    # -------------------------------
+    # projects
+    # -------------------------------
     project:
-        - 'openstack':
-            project-repo: 'https://git.openstack.org/openstack/bifrost'
-            clone-location: '/opt/bifrost'
-        - 'opnfv':
-            project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
-            clone-location: '/opt/releng-xci'
-
-#--------------------------------
-# jobs
-#--------------------------------
+      - 'openstack':
+          project-repo: 'https://git.openstack.org/openstack/bifrost'
+          clone-location: '/opt/bifrost'
+      - 'opnfv':
+          project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+          clone-location: '/opt/releng-xci'
+
+    # -------------------------------
+    # jobs
+    # -------------------------------
     jobs:
-        - '{project}-bifrost-cleanup-{stream}'
+      - '{project}-bifrost-cleanup-{stream}'
 
 - job-template:
     name: '{project}-bifrost-cleanup-{stream}'
@@ -34,109 +35,111 @@
     # Make sure no verify job is running on any of the slaves since that would
     # produce build logs after we wipe the destination directory.
     properties:
-        - build-blocker:
-            blocking-jobs:
-                - '{project}-bifrost-verify-*'
+      - build-blocker:
+          blocking-jobs:
+            - '{project}-bifrost-verify-*'
 
     parameters:
-        - string:
-            name: PROJECT
-            default: '{project}'
+      - string:
+          name: PROJECT
+          default: '{project}'
 
     builders:
-        - shell: |
-            #!/bin/bash
-
-            set -eu
-
-            # DO NOT change this unless you know what you are doing.
-            BIFROST_GS_URL="gs://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/"
-
-            # This should never happen... even 'recheck' uses the last jobs'
-            # gerrit information. Better exit with error so we can investigate
-            [[ ! -n $GERRIT_NAME ]] || [[ ! -n $GERRIT_CHANGE_NUMBER ]] && exit 1
-
-            echo "Removing build artifacts for $GERRIT_NAME/$GERRIT_CHANGE_NUMBER"
-
-            if ! [[ "$BIFROST_GS_URL" =~ "/cross-community-ci/openstack/bifrost/" ]]; then
-                echo "Oops! BIFROST_GS_URL=$BIFROST_GS_URL does not seem like a valid"
-                echo "bifrost location on the Google storage server. Please double-check"
-                echo "that it's set properly or fix this line if necessary."
-                echo "gsutil will not be executed until this is fixed!"
-                exit 1
-            fi
-            try_to_rm=1
-            while [[ $try_to_rm -lt 6 ]]; do
-                gsutil -m rm -r $BIFROST_GS_URL && _exitcode=$? && break
-                _exitcode=$?
-                echo "gsutil rm failed! Trying again... (attempt #$try_to_rm)"
-                let try_to_rm += 1
-                # Give it some time...
-                sleep 10
-            done
-            exit $_exitcode
+      - shell: |
+          #!/bin/bash
+
+          set -eu
+
+          # DO NOT change this unless you know what you are doing.
+          BIFROST_GS_URL="gs://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/"
+
+          # This should never happen... even 'recheck' uses the last jobs'
+          # gerrit information. Better exit with error so we can investigate
+          [[ ! -n $GERRIT_NAME ]] || [[ ! -n $GERRIT_CHANGE_NUMBER ]] && exit 1
+
+          echo "Removing build artifacts for $GERRIT_NAME/$GERRIT_CHANGE_NUMBER"
+
+          if ! [[ "$BIFROST_GS_URL" =~ "/cross-community-ci/openstack/bifrost/" ]]; then
+              echo "Oops! BIFROST_GS_URL=$BIFROST_GS_URL does not seem like a valid"
+              echo "bifrost location on the Google storage server. Please double-check"
+              echo "that it's set properly or fix this line if necessary."
+              echo "gsutil will not be executed until this is fixed!"
+              exit 1
+          fi
+          try_to_rm=1
+          while [[ $try_to_rm -lt 6 ]]; do
+              gsutil -m rm -r $BIFROST_GS_URL && _exitcode=$? && break
+              _exitcode=$?
+              echo "gsutil rm failed! Trying again... (attempt #$try_to_rm)"
+              let try_to_rm += 1
+              # Give it some time...
+              sleep 10
+          done
+          exit $_exitcode
 
     triggers:
-        - '{project}-gerrit-trigger-cleanup':
-            branch: '{branch}'
+      - '{project}-gerrit-trigger-cleanup':
+          branch: '{branch}'
 
     publishers:
-        - email:
-            recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com zhang.jun3g@zte.com.cn
-        - email-jenkins-admins-on-failure
-#--------------------------------
+      # yamllint disable rule:line-length
+      - email:
+          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com zhang.jun3g@zte.com.cn
+      # yamllint enable rule:line-length
+      - email-jenkins-admins-on-failure
+# -------------------------------
 # trigger macros
-#--------------------------------
+# -------------------------------
 - trigger:
     name: 'openstack-gerrit-trigger-cleanup'
     triggers:
-        - gerrit:
-            server-name: 'review.openstack.org'
-            escape-quotes: true
-            trigger-on:
-                # We only run this when the change is merged or
-                # abandoned since we don't need the logs anymore
-                - change-merged-event
-                - change-abandoned-event
-            # This is an OPNFV maintenance job. We don't want to provide
-            # feedback on Gerrit
-            silent: true
-            silent-start: true
-            projects:
-              - project-compare-type: 'PLAIN'
-                project-pattern: 'openstack/bifrost'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                disable-strict-forbidden-file-verification: 'true'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'doc/**'
-                  - compare-type: ANT
-                    pattern: 'releasenotes/**'
-                disable-strict-forbidden-file-verification: 'true'
-            readable-message: true
+      - gerrit:
+          server-name: 'review.openstack.org'
+          escape-quotes: true
+          trigger-on:
+            # We only run this when the change is merged or
+            # abandoned since we don't need the logs anymore
+            - change-merged-event
+            - change-abandoned-event
+          # This is an OPNFV maintenance job. We don't want to provide
+          # feedback on Gerrit
+          silent: true
+          silent-start: true
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'openstack/bifrost'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'doc/**'
+                - compare-type: ANT
+                  pattern: 'releasenotes/**'
+          readable-message: true
+
 - trigger:
     name: 'opnfv-gerrit-trigger-cleanup'
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                # We only run this when the change is merged or
-                # abandoned since we don't need the logs anymore
-                - change-merged-event
-                - change-abandoned-event
-            # This is an OPNFV maintenance job. We don't want to provide
-            # feedback on Gerrit
-            silent: true
-            silent-start: true
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng-xci'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'bifrost/**'
-            readable-message: true
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            # We only run this when the change is merged or
+            # abandoned since we don't need the logs anymore
+            - change-merged-event
+            - change-abandoned-event
+          # This is an OPNFV maintenance job. We don't want to provide
+          # feedback on Gerrit
+          silent: true
+          silent-start: true
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng-xci'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'bifrost/**'
+          readable-message: true
diff --git a/jjb/xci/bifrost-periodic-jobs.yml b/jjb/xci/bifrost-periodic-jobs.yml
index 67151891f..0bca26aa5 100644
--- a/jjb/xci/bifrost-periodic-jobs.yml
+++ b/jjb/xci/bifrost-periodic-jobs.yml
@@ -1,68 +1,71 @@
+---
 - project:
     project: 'releng-xci'
 
     name: 'bifrost-periodic'
-#--------------------------------
-# Branch Anchors
-#--------------------------------
-# the versions stated here default to branches which then later
-# on used for checking out the branches, pulling in head of the branch.
+    # -------------------------------
+    # Branch Anchors
+    # -------------------------------
+    # the versions stated here default to branches which then later
+    # on used for checking out the branches, pulling in head of the branch.
     master: &master
-        stream: master
-        openstack-bifrost-version: '{stream}'
-        opnfv-releng-version: 'master'
-        gs-pathname: ''
+      stream: master
+      openstack-bifrost-version: '{stream}'
+      opnfv-releng-version: 'master'
+      gs-pathname: ''
     ocata: &ocata
-        stream: ocata
-        openstack-bifrost-version: 'stable/{stream}'
-        opnfv-releng-version: 'master'
-        gs-pathname: '/{stream}'
-#--------------------------------
-#        XCI PODs
-#--------------------------------
+      stream: ocata
+      openstack-bifrost-version: 'stable/{stream}'
+      opnfv-releng-version: 'master'
+      gs-pathname: '/{stream}'
+    # -------------------------------
+    #        XCI PODs
+    # -------------------------------
     pod:
-        - virtual:
-            <<: *master
-        - virtual:
-            <<: *ocata
-#--------------------------------
-# XCI PODs
-#--------------------------------
-#--------------------------------
-# Supported Distros
-#--------------------------------
+      - virtual:
+          <<: *master
+      - virtual:
+          <<: *ocata
+    # -------------------------------
+    # XCI PODs
+    # -------------------------------
+    # -------------------------------
+    # Supported Distros
+    # -------------------------------
     distro:
-        - 'xenial':
-            disabled: false
-            slave-label: xci-xenial-virtual
-            dib-os-release: 'xenial'
-            dib-os-element: 'ubuntu-minimal'
-            dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptables'
-            extra-dib-elements: 'openssh-server'
-        - 'centos7':
-            disabled: true
-            slave-label: xci-centos7-virtual
-            dib-os-release: '7'
-            dib-os-element: 'centos7'
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-            extra-dib-elements: 'openssh-server'
-        - 'suse':
-            disabled: true
-            slave-label: xci-suse-virtual
-            dib-os-release: '42.3'
-            dib-os-element: 'opensuse-minimal'
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-            extra-dib-elements: 'openssh-server'
+      - 'xenial':
+          disabled: false
+          slave-label: xci-xenial-virtual
+          dib-os-release: 'xenial'
+          dib-os-element: 'ubuntu-minimal'
+          # yamllint disable rule:line-length
+          dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptables'
+          # yamllint enable rule:line-length
+          extra-dib-elements: 'openssh-server'
+      - 'centos7':
+          disabled: true
+          slave-label: xci-centos7-virtual
+          dib-os-release: '7'
+          dib-os-element: 'centos7'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'suse':
+          disabled: true
+          slave-label: xci-suse-virtual
+          dib-os-release: '42.3'
+          dib-os-element: 'opensuse-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
 
-#--------------------------------
-# jobs
-#--------------------------------
+    # -------------------------------
+    # jobs
+    # -------------------------------
     jobs:
-        - 'bifrost-provision-{pod}-{distro}-periodic-{stream}'
+      - 'bifrost-provision-{pod}-{distro}-periodic-{stream}'
 
-#--------------------------------
+# -------------------------------
 # job templates
-#--------------------------------
+# -------------------------------
 - job-template:
     name: 'bifrost-provision-{pod}-{distro}-periodic-{stream}'
 
@@ -71,79 +74,79 @@
     concurrent: false
 
     properties:
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - '^xci-os.*'
-                - '^xci-deploy.*'
-                - '^xci-functest.*'
-                - '^bifrost-.*periodic.*'
-                - '^osa-.*periodic.*'
-            block-level: 'NODE'
-        - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '^xci-os.*'
+            - '^xci-deploy.*'
+            - '^xci-functest.*'
+            - '^bifrost-.*periodic.*'
+            - '^osa-.*periodic.*'
+          block-level: 'NODE'
+      - logrotate-default
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{opnfv-releng-version}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-        - string:
-            name: XCI_FLAVOR
-            default: 'ha'
-        - string:
-            name: OPENSTACK_BIFROST_VERSION
-            default: '{openstack-bifrost-version}'
-        - string:
-            name: OPNFV_RELENG_VERSION
-            default: '{opnfv-releng-version}'
-        - string:
-            name: DISTRO
-            default: '{distro}'
-        - string:
-            name: DIB_OS_RELEASE
-            default: '{dib-os-release}'
-        - string:
-            name: DIB_OS_ELEMENT
-            default: '{dib-os-element}'
-        - string:
-            name: DIB_OS_PACKAGES
-            default: '{dib-os-packages}'
-        - string:
-            name: EXTRA_DIB_ELEMENTS
-            default: '{extra-dib-elements}'
-        - string:
-            name: CLEAN_DIB_IMAGES
-            default: 'true'
-        - label:
-            name: SLAVE_LABEL
-            default: '{slave-label}'
-        - string:
-            name: XCI_LOOP
-            default: 'periodic'
+      - project-parameter:
+          project: '{project}'
+          branch: '{opnfv-releng-version}'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+      - string:
+          name: XCI_FLAVOR
+          default: 'ha'
+      - string:
+          name: OPENSTACK_BIFROST_VERSION
+          default: '{openstack-bifrost-version}'
+      - string:
+          name: OPNFV_RELENG_VERSION
+          default: '{opnfv-releng-version}'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib-os-release}'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: '{dib-os-element}'
+      - string:
+          name: DIB_OS_PACKAGES
+          default: '{dib-os-packages}'
+      - string:
+          name: EXTRA_DIB_ELEMENTS
+          default: '{extra-dib-elements}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - label:
+          name: SLAVE_LABEL
+          default: '{slave-label}'
+      - string:
+          name: XCI_LOOP
+          default: 'periodic'
 
     wrappers:
-        - fix-workspace-permissions
+      - fix-workspace-permissions
 
     scm:
-        - git-scm
+      - git-scm
 
     # trigger is disabled until we know which jobs we will have
     # and adjust stuff accordingly
     triggers:
-        - timed: ''  # '@midnight'
+      - timed: ''  # '@midnight'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME - Flavor: $XCI_FLAVOR"
-        - 'bifrost-provision-builder'
+      - description-setter:
+          description: "Built on $NODE_NAME - Flavor: $XCI_FLAVOR"
+      - 'bifrost-provision-builder'
 
-#---------------------------
+# --------------------------
 # builder macros
-#---------------------------
+# --------------------------
 - builder:
     name: bifrost-provision-builder
     builders:
-        - shell:
-            !include-raw: ./bifrost-provision.sh
+      - shell:
+          !include-raw: ./bifrost-provision.sh
diff --git a/jjb/xci/bifrost-verify-jobs.yml b/jjb/xci/bifrost-verify-jobs.yml
index f9106831c..137787d7a 100644
--- a/jjb/xci/bifrost-verify-jobs.yml
+++ b/jjb/xci/bifrost-verify-jobs.yml
@@ -1,57 +1,58 @@
+---
 - project:
     name: 'openstack-bifrost-verify'
-#--------------------------------
-# branches
-#--------------------------------
+    # -------------------------------
+    # branches
+    # -------------------------------
     stream:
-        - master:
-            branch: '{stream}'
-#--------------------------------
-# projects
-#--------------------------------
+      - master:
+          branch: '{stream}'
+    # -------------------------------
+    # projects
+    # -------------------------------
     project:
-        - 'openstack':
-            project-repo: 'https://git.openstack.org/openstack/bifrost'
-            clone-location: '$WORKSPACE/bifrost'
-        - 'opnfv':
-            project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
-            clone-location: '$WORKSPACE/releng-xci'
-#--------------------------------
-# distros
-#--------------------------------
+      - 'openstack':
+          project-repo: 'https://git.openstack.org/openstack/bifrost'
+          clone-location: '$WORKSPACE/bifrost'
+      - 'opnfv':
+          project-repo: 'https://gerrit.opnfv.org/gerrit/releng-xci'
+          clone-location: '$WORKSPACE/releng-xci'
+    # -------------------------------
+    # distros
+    # -------------------------------
     distro:
-        - 'xenial':
-            disabled: true
-            dib-os-release: 'xenial'
-            dib-os-element: 'ubuntu-minimal'
-            dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
-            extra-dib-elements: 'openssh-server'
-        - 'centos7':
-            disabled: true
-            dib-os-release: '7'
-            dib-os-element: 'centos-minimal'
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-            extra-dib-elements: 'openssh-server'
-        - 'suse':
-            disabled: true
-            dib-os-release: '42.3'
-            dib-os-element: 'opensuse-minimal'
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-            extra-dib-elements: 'openssh-server'
-#--------------------------------
-# type
-#--------------------------------
+      - 'xenial':
+          disabled: true
+          dib-os-release: 'xenial'
+          dib-os-element: 'ubuntu-minimal'
+          dib-os-packages: 'vlan,vim,less,bridge-utils,language-pack-en,iputils-ping,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'centos7':
+          disabled: true
+          dib-os-release: '7'
+          dib-os-element: 'centos-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'suse':
+          disabled: true
+          dib-os-release: '42.3'
+          dib-os-element: 'opensuse-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+    # -------------------------------
+    # type
+    # -------------------------------
     type:
-        - virtual
-#--------------------------------
-# jobs
-#--------------------------------
+      - virtual
+    # -------------------------------
+    # jobs
+    # -------------------------------
     jobs:
-        - '{project}-bifrost-verify-{distro}-{type}-{stream}'
+      - '{project}-bifrost-verify-{distro}-{type}-{stream}'
 
-#--------------------------------
+# -------------------------------
 # VM defaults
-#--------------------------------
+# -------------------------------
 - defaults:
     name: verify_vm_defaults
     test-vm-num-nodes: '3'
@@ -62,9 +63,9 @@
     vm-memory-size: '4096'
     vm-disk-cache: 'unsafe'
 
-#--------------------------------
+# -------------------------------
 # job templates
-#--------------------------------
+# -------------------------------
 - job-template:
     name: '{project}-bifrost-verify-{distro}-{type}-{stream}'
 
@@ -75,170 +76,174 @@
     concurrent: false
 
     properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - '.*-bifrost-verify.*-{type}'
-            block-level: 'NODE'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '.*-bifrost-verify.*-{type}'
+          block-level: 'NODE'
 
     parameters:
-        - string:
-            name: PROJECT
-            default: '{project}'
-        - string:
-            name: PROJECT_REPO
-            default: '{project-repo}'
-        - string:
-            name: CLONE_LOCATION
-            default: '{clone-location}'
-        - string:
-            name: DISTRO
-            default: '{distro}'
-        - string:
-            name: DIB_OS_RELEASE
-            default: '{dib-os-release}'
-        - string:
-            name: DIB_OS_ELEMENT
-            default: '{dib-os-element}'
-        - string:
-            name: EXTRA_DIB_ELEMENTS
-            default: '{extra-dib-elements}'
-        - string:
-            name: DIB_OS_PACKAGES
-            default: '{dib-os-packages}'
-        - string:
-            name: TEST_VM_NUM_NODES
-            default: '{test-vm-num-nodes}'
-        - string:
-            name: TEST_VM_NODE_NAMES
-            default: '{test-vm-node-names}'
-        - string:
-            name: VM_DOMAIN_TYPE
-            default: '{vm-domain-type}'
-        - string:
-            name: VM_CPU
-            default: '{vm-cpu}'
-        - string:
-            name: VM_DISK
-            default: '{vm-disk}'
-        - string:
-            name: VM_MEMORY_SIZE
-            default: '{vm-memory-size}'
-        - string:
-            name: VM_DISK_CACHE
-            default: '{vm-disk-cache}'
-        - string:
-            name: CLEAN_DIB_IMAGES
-            default: 'true'
-        - label:
-            name: SLAVE_LABEL
-            default: 'infra-{type}-{distro}'
-        - string:
-            name: BIFROST_LOG_URL
-            default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
-        - string:
-            name: XCI_LOOP
-            default: 'verify'
+      - string:
+          name: PROJECT
+          default: '{project}'
+      - string:
+          name: PROJECT_REPO
+          default: '{project-repo}'
+      - string:
+          name: CLONE_LOCATION
+          default: '{clone-location}'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib-os-release}'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: '{dib-os-element}'
+      - string:
+          name: EXTRA_DIB_ELEMENTS
+          default: '{extra-dib-elements}'
+      - string:
+          name: DIB_OS_PACKAGES
+          default: '{dib-os-packages}'
+      - string:
+          name: TEST_VM_NUM_NODES
+          default: '{test-vm-num-nodes}'
+      - string:
+          name: TEST_VM_NODE_NAMES
+          default: '{test-vm-node-names}'
+      - string:
+          name: VM_DOMAIN_TYPE
+          default: '{vm-domain-type}'
+      - string:
+          name: VM_CPU
+          default: '{vm-cpu}'
+      - string:
+          name: VM_DISK
+          default: '{vm-disk}'
+      - string:
+          name: VM_MEMORY_SIZE
+          default: '{vm-memory-size}'
+      - string:
+          name: VM_DISK_CACHE
+          default: '{vm-disk-cache}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - label:
+          name: SLAVE_LABEL
+          default: 'infra-{type}-{distro}'
+      # yamllint disable rule:line-length
+      - string:
+          name: BIFROST_LOG_URL
+          default: 'http://artifacts.opnfv.org/cross-community-ci/openstack/bifrost/$GERRIT_NAME/$GERRIT_CHANGE_NUMBER/$GERRIT_PATCHSET_NUMBER/$JOB_NAME'
+      # yamllint enable rule:line-length
+      - string:
+          name: XCI_LOOP
+          default: 'verify'
 
     scm:
-        - git:
-            url: '$PROJECT_REPO'
-            refspec: '$GERRIT_REFSPEC'
-            branches:
-                - 'origin/$BRANCH'
-            skip-tag: true
-            choosing-strategy: 'gerrit'
-            timeout: 10
-            wipe-workspace: true
+      - git:
+          url: '$PROJECT_REPO'
+          refspec: '$GERRIT_REFSPEC'
+          branches:
+            - 'origin/$BRANCH'
+          skip-tag: true
+          choosing-strategy: 'gerrit'
+          timeout: 10
+          wipe-workspace: true
 
     triggers:
-        - '{project}-gerrit-trigger':
-            branch: '{branch}'
+      - '{project}-gerrit-trigger':
+          branch: '{branch}'
 
     builders:
-        - bifrost-set-name
-        - bifrost-build
+      - bifrost-set-name
+      - bifrost-build
 
     wrappers:
-        - fix-workspace-permissions
-        - build-timeout:
-            timeout: 90
+      - fix-workspace-permissions
+      - build-timeout:
+          timeout: 90
 
     publishers:
-        - email:
-            recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
-        - email-jenkins-admins-on-failure
-#--------------------------------
+      # yamllint disable rule:line-length
+      - email:
+          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
+      # yamllint enable rule:line-length
+      - email-jenkins-admins-on-failure
+# -------------------------------
 # trigger macros
-#--------------------------------
+# -------------------------------
 - trigger:
     name: 'openstack-gerrit-trigger'
     triggers:
-        - gerrit:
-            server-name: 'review.openstack.org'
-            escape-quotes: true
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
-            silent-start: true
-            projects:
-              - project-compare-type: 'PLAIN'
-                project-pattern: 'openstack/bifrost'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                disable-strict-forbidden-file-verification: 'true'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'doc/**'
-                  - compare-type: ANT
-                    pattern: 'releasenotes/**'
-                disable-strict-forbidden-file-verification: 'true'
-            readable-message: true
+      - gerrit:
+          server-name: 'review.openstack.org'
+          escape-quotes: true
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+          custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
+          silent-start: true
+          projects:
+            - project-compare-type: 'PLAIN'
+              project-pattern: 'openstack/bifrost'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'doc/**'
+                - compare-type: ANT
+                  pattern: 'releasenotes/**'
+          readable-message: true
+
 - trigger:
     name: 'opnfv-gerrit-trigger'
     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'
-            custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng-xci'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'bifrost/**'
-            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'
+          custom-url: '* $JOB_NAME $BIFROST_LOG_URL/index.html'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: 'releng-xci'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'bifrost/**'
+          readable-message: true
 
-#---------------------------
+# --------------------------
 # builder macros
-#---------------------------
+# --------------------------
 - builder:
     name: bifrost-set-name
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
+      - description-setter:
+          description: "Built on $NODE_NAME"
 
 - builder:
     name: bifrost-build
     builders:
-        - shell:
-            !include-raw: ./bifrost-verify.sh
+      - shell:
+          !include-raw: ./bifrost-verify.sh
diff --git a/jjb/xci/osa-periodic-jobs.yml b/jjb/xci/osa-periodic-jobs.yml
index 048825e74..26c1575f4 100644
--- a/jjb/xci/osa-periodic-jobs.yml
+++ b/jjb/xci/osa-periodic-jobs.yml
@@ -1,43 +1,45 @@
+---
 - project:
     name: 'opnfv-osa-periodic'
 
     project: 'releng-xci'
-#--------------------------------
-# branches
-#--------------------------------
+    # -------------------------------
+    # branches
+    # -------------------------------
     stream:
-        - master:
-            branch: '{stream}'
-#--------------------------------
-# distros
-#--------------------------------
+      - master:
+          branch: '{stream}'
+    # -------------------------------
+    # distros
+    # -------------------------------
     distro:
-        - 'xenial':
-            disabled: false
-        - 'centos7':
-            disabled: true
-        - 'suse':
-            disabled: true
-#--------------------------------
-# type
-#--------------------------------
+      - 'xenial':
+          disabled: false
+      - 'centos7':
+          disabled: true
+      - 'suse':
+          disabled: true
+    # -------------------------------
+    # type
+    # -------------------------------
     type:
-        - virtual
-#--------------------------------
-# phases
-#--------------------------------
+      - virtual
+    # -------------------------------
+    # phases
+    # -------------------------------
     phase:
-        - 'deploy'
-        - 'healthcheck'
-#--------------------------------
-# jobs
-#--------------------------------
+      - 'deploy'
+      - 'healthcheck'
+    # -------------------------------
+    # jobs
+    # -------------------------------
     jobs:
-        - 'osa-periodic-{distro}-{type}-{stream}'
-        - 'osa-periodic-{phase}-{type}-{stream}'
-#--------------------------------
+      - 'osa-periodic-{distro}-{type}-{stream}'
+      - 'osa-periodic-{phase}-{type}-{stream}'
+
+# -------------------------------
 # job templates
-#--------------------------------
+# -------------------------------
 - job-template:
     name: 'osa-periodic-{distro}-{type}-{stream}'
 
@@ -48,69 +50,69 @@
     concurrent: false
 
     properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'xci-verify-.*'
-                - 'bifrost-verify-.*'
-                - 'bifrost-periodic-.*'
-                - 'osa-verify-.*'
-                - 'osa-periodic-.*'
-            block-level: 'NODE'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'xci-verify-.*'
+            - 'bifrost-verify-.*'
+            - 'bifrost-periodic-.*'
+            - 'osa-verify-.*'
+            - 'osa-periodic-.*'
+          block-level: 'NODE'
 
     wrappers:
-        - ssh-agent-wrapper
-        - build-timeout:
-            timeout: 240
-        - fix-workspace-permissions
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
 
     scm:
-        - git-scm-osa
+      - git-scm-osa
 
     triggers:
-        - pollscm:
-            cron: "@midnight"
-            ignore-post-commit-hooks: True
+      - pollscm:
+          cron: "@midnight"
+          ignore-post-commit-hooks: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - label:
-            name: SLAVE_LABEL
-            default: 'xci-virtual-{distro}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual-{distro}'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'osa-periodic-deploy-{type}-{stream}'
-                  current-parameters: true
-                  predefined-parameters: |
-                    DISTRO={distro}
-                    DEPLOY_SCENARIO=os-nosdn-nofeature-noha
-                  git-revision: true
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: healthcheck
-            condition: SUCCESSFUL
-            projects:
-                - name: 'osa-periodic-healthcheck-{type}-{stream}'
-                  current-parameters: true
-                  predefined-parameters: |
-                    DISTRO={distro}
-                    DEPLOY_SCENARIO=os-nosdn-nofeature-noha
-                    FUNCTEST_MODE=tier
-                    FUNCTEST_TIER=healthcheck
-                  node-parameters: true
-                  kill-phase-on: NEVER
-                  abort-all-job: false
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: deploy
+          condition: SUCCESSFUL
+          projects:
+            - name: 'osa-periodic-deploy-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+              git-revision: true
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: healthcheck
+          condition: SUCCESSFUL
+          projects:
+            - name: 'osa-periodic-healthcheck-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                FUNCTEST_MODE=tier
+                FUNCTEST_TIER=healthcheck
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: false
 
 - job-template:
     name: 'osa-periodic-{phase}-{type}-{stream}'
@@ -120,109 +122,109 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'xci-verify-deploy-.*'
-                - 'xci-verify-healthcheck-.*'
-                - 'bifrost-verify-.*'
-                - 'bifrost-periodic-.*'
-                - 'osa-verify-deploy-.*'
-                - 'osa-verify-halthcheck-.*'
-                - 'osa-periodic-deploy-.*'
-                - 'osa-periodic-healthcheck-.*'
-            block-level: 'NODE'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'xci-verify-deploy-.*'
+            - 'xci-verify-healthcheck-.*'
+            - 'bifrost-verify-.*'
+            - 'bifrost-periodic-.*'
+            - 'osa-verify-deploy-.*'
+            - 'osa-verify-halthcheck-.*'
+            - 'osa-periodic-deploy-.*'
+            - 'osa-periodic-healthcheck-.*'
+          block-level: 'NODE'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - label:
-            name: SLAVE_LABEL
-            default: 'xci-virtual-{distro}'
-        - string:
-            name: OPENSTACK_OSA_VERSION
-            default: 'master'
-        - string:
-            name: DISTRO
-            default: 'xenial'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-noha'
-        - string:
-            name: XCI_FLAVOR
-            default: 'mini'
-        - string:
-            name: XCI_LOOP
-            default: 'periodic'
-        - string:
-            name: OPNFV_RELENG_DEV_PATH
-            default: $WORKSPACE/releng-xci
-        - string:
-            name: FUNCTEST_MODE
-            default: 'tier'
-        - string:
-            name: FUNCTEST_SUITE_NAME
-            default: 'healthcheck'
-        - string:
-            name: FORCE_MASTER
-            default: 'true'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual-{distro}'
+      - string:
+          name: OPENSTACK_OSA_VERSION
+          default: 'master'
+      - string:
+          name: DISTRO
+          default: 'xenial'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: XCI_FLAVOR
+          default: 'mini'
+      - string:
+          name: XCI_LOOP
+          default: 'periodic'
+      - string:
+          name: OPNFV_RELENG_DEV_PATH
+          default: $WORKSPACE/releng-xci
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: FORCE_MASTER
+          default: 'true'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
 
     scm:
-        - git-scm-osa
+      - git-scm-osa
 
     wrappers:
-        - ssh-agent-wrapper
-        - build-timeout:
-            timeout: 240
-        - fix-workspace-permissions
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - 'osa-periodic-{phase}-macro'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - 'osa-periodic-{phase}-macro'
 
-#--------------------------------
+# -------------------------------
 # builder macros
-#--------------------------------
+# -------------------------------
 - builder:
     name: 'osa-periodic-deploy-macro'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            # here we will
-            # - clone releng-xci repo as the jobs are running against openstack gerrit
-            #   and we need to clone releng-xci ourselves to $OPNFV_RELENG_DEV_PATH
-            # - run sources-branch-updater.sh from osa to update/pin the role versions
-            #   at the time this job gets triggered against osa master in case if the
-            #   deployment succeeds and we decide to bump version used by xci
-            # - copy generated role versions into $OPNFV_RELENG_DEV_PATH/xci/file
-            # - start the deployment by executing xci-deploy.sh as usual
-            #
-            # we might also need to pin versions of openstack services as well.
-
-            echo "Hello World!"
+      - shell: |
+          #!/bin/bash
+
+          # here we will
+          # - clone releng-xci repo as the jobs are running against openstack gerrit
+          #   and we need to clone releng-xci ourselves to $OPNFV_RELENG_DEV_PATH
+          # - run sources-branch-updater.sh from osa to update/pin the role versions
+          #   at the time this job gets triggered against osa master in case if the
+          #   deployment succeeds and we decide to bump version used by xci
+          # - copy generated role versions into $OPNFV_RELENG_DEV_PATH/xci/file
+          # - start the deployment by executing xci-deploy.sh as usual
+          #
+          # we might also need to pin versions of openstack services as well.
+
+          echo "Hello World!"
 
 - builder:
     name: 'osa-periodic-healthcheck-macro'
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            echo "Hello World!"
-#--------------------------------
+          echo "Hello World!"
+# -------------------------------
 # scm macro
-#--------------------------------
+# -------------------------------
 - scm:
     name: git-scm-osa
     scm:
-        - git:
-            url: https://review.openstack.org/p/openstack/openstack-ansible.git
-            branches:
-                - master
-            timeout: 15
+      - git:
+          url: https://review.openstack.org/p/openstack/openstack-ansible.git
+          branches:
+            - master
+          timeout: 15
diff --git a/jjb/xci/xci-daily-jobs.yml b/jjb/xci/xci-daily-jobs.yml
index 7d95429da..a95374933 100644
--- a/jjb/xci/xci-daily-jobs.yml
+++ b/jjb/xci/xci-daily-jobs.yml
@@ -1,85 +1,88 @@
-#--------------------------------
+---
+# -------------------------------
 # These jobs run on a daily basis and deploy OpenStack
 # using the pinned versions of opnfv/releng, openstack/bifrost
 # and openstack/openstack-ansible. Due to this, there is no
 # version/branch is set/passed to jobs and instead the versions
 # are checked out based on what is configured.
-#--------------------------------
+# -------------------------------
 - project:
     project: 'releng-xci'
 
     name: 'xci-daily'
-#--------------------------------
-# Branch Anchors
-#--------------------------------
+    # -------------------------------
+    # Branch Anchors
+    # -------------------------------
     master: &master
-        stream: master
-        opnfv-releng-version: master
-        gs-pathname: ''
-#--------------------------------
-# Scenarios
-#--------------------------------
+      stream: master
+      opnfv-releng-version: master
+      gs-pathname: ''
+    # -------------------------------
+    # Scenarios
+    # -------------------------------
     scenario:
-        - 'os-nosdn-nofeature-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
-            xci-flavor: 'ha'
-        - 'os-nosdn-nofeature-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
-            xci-flavor: 'noha'
-        - 'os-odl-sfc-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
-            xci-flavor: 'ha'
-        - 'os-odl-sfc-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
-            xci-flavor: 'noha'
-#--------------------------------
-# XCI PODs
-#--------------------------------
+      - 'os-nosdn-nofeature-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'ha'
+      - 'os-nosdn-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'noha'
+      - 'os-odl-sfc-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'ha'
+      - 'os-odl-sfc-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+          xci-flavor: 'noha'
+    # -------------------------------
+    # XCI PODs
+    # -------------------------------
     pod:
-        - virtual:
-            <<: *master
-#--------------------------------
-# Supported Distros
-#--------------------------------
+      - virtual:
+          <<: *master
+    # -------------------------------
+    # Supported Distros
+    # -------------------------------
     distro:
-        - 'xenial':
-            disabled: false
-            slave-label: xci-xenial-virtual
-            dib-os-release: 'xenial'
-            dib-os-element: 'ubuntu-minimal'
-            dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptabls'
-            extra-dib-elements: 'openssh-server'
-        - 'centos7':
-            disabled: true
-            slave-label: xci-centos7-virtual
-            dib-os-release: '7'
-            dib-os-element: 'centos7'
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-            extra-dib-elements: 'openssh-server'
-        - 'suse':
-            disabled: true
-            slave-label: xci-suse-virtual
-            dib-os-release: '42.3'
-            dib-os-element: 'opensuse-minimal'
-            dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
-            extra-dib-elements: 'openssh-server'
-
-#--------------------------------
-#        Phases
-#--------------------------------
+      - 'xenial':
+          disabled: false
+          slave-label: xci-xenial-virtual
+          dib-os-release: 'xenial'
+          dib-os-element: 'ubuntu-minimal'
+          # yamllint disable rule:line-length
+          dib-os-packages: 'vlan,vim,less,bridge-utils,sudo,language-pack-en,iputils-ping,rsyslog,curl,python,debootstrap,ifenslave,ifenslave-2.6,lsof,lvm2,tcpdump,nfs-kernel-server,chrony,iptabls'
+          # yamllint enable rule:line-length
+          extra-dib-elements: 'openssh-server'
+      - 'centos7':
+          disabled: true
+          slave-label: xci-centos7-virtual
+          dib-os-release: '7'
+          dib-os-element: 'centos7'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+      - 'suse':
+          disabled: true
+          slave-label: xci-suse-virtual
+          dib-os-release: '42.3'
+          dib-os-element: 'opensuse-minimal'
+          dib-os-packages: 'vim,less,bridge-utils,iputils,rsyslog,curl'
+          extra-dib-elements: 'openssh-server'
+
+    # -------------------------------
+    #        Phases
+    # -------------------------------
     phase:
-        - 'deploy'
-        - 'functest'
-#--------------------------------
-# jobs
-#--------------------------------
+      - 'deploy'
+      - 'functest'
+    # -------------------------------
+    # jobs
+    # -------------------------------
     jobs:
-        - 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
-        - 'xci-{phase}-{pod}-{distro}-daily-{stream}'
+      - 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
+      - 'xci-{phase}-{pod}-{distro}-daily-{stream}'
 
-#--------------------------------
+# -------------------------------
 # job templates
-#--------------------------------
+# -------------------------------
 - job-template:
     name: 'xci-{scenario}-{pod}-{distro}-daily-{stream}'
 
@@ -88,67 +91,69 @@
     concurrent: false
 
     properties:
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - '^xci-os.*'
-                - '^xci-deploy.*'
-                - '^xci-functest.*'
-                - '^bifrost-.*periodic.*'
-                - '^osa-.*periodic.*'
-            block-level: 'NODE'
-        - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '^xci-os.*'
+            - '^xci-deploy.*'
+            - '^xci-functest.*'
+            - '^bifrost-.*periodic.*'
+            - '^osa-.*periodic.*'
+          block-level: 'NODE'
+      - logrotate-default
 
     parameters:
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
-        - string:
-            name: XCI_FLAVOR
-            default: '{xci-flavor}'
-        - label:
-            name: SLAVE_LABEL
-            default: '{slave-label}'
-        - string:
-            name: XCI_LOOP
-            default: 'daily'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
+      - string:
+          name: XCI_FLAVOR
+          default: '{xci-flavor}'
+      - label:
+          name: SLAVE_LABEL
+          default: '{slave-label}'
+      - string:
+          name: XCI_LOOP
+          default: 'daily'
 
     triggers:
-        - '{auto-trigger-name}'
+      - '{auto-trigger-name}'
 
     wrappers:
-        - fix-workspace-permissions
+      - fix-workspace-permissions
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - trigger-builds:
-            - project: 'xci-deploy-{pod}-{distro}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                XCI_FLAVOR=$XCI_FLAVOR
-                XCI_LOOP=$XCI_LOOP
-              same-node: true
-              block: true
-        - trigger-builds:
-            - project: 'xci-functest-{pod}-{distro}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                XCI_FLAVOR=$XCI_FLAVOR
-                XCI_LOOP=$XCI_LOOP
-              same-node: true
-              block: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - trigger-builds:
+          - project: 'xci-deploy-{pod}-{distro}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              XCI_FLAVOR=$XCI_FLAVOR
+              XCI_LOOP=$XCI_LOOP
+            same-node: true
+            block: true
+      - trigger-builds:
+          - project: 'xci-functest-{pod}-{distro}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              XCI_FLAVOR=$XCI_FLAVOR
+              XCI_LOOP=$XCI_LOOP
+            same-node: true
+            block: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
 
     publishers:
-        - email:
-            recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
-        - email-jenkins-admins-on-failure
+      # yamllint disable rule:line-length
+      - email:
+          recipients: fatih.degirmenci@ericsson.com yroblamo@redhat.com mchandras@suse.de jack.morgan@intel.com julienjut@gmail.com
+      # yamllint enable rule:line-length
+      - email-jenkins-admins-on-failure
 
 - job-template:
     name: 'xci-{phase}-{pod}-{distro}-daily-{stream}'
@@ -158,93 +163,94 @@
     concurrent: false
 
     properties:
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - '^xci-deploy.*'
-                - '^xci-functest.*'
-                - '^bifrost-.*periodic.*'
-                - '^osa-.*periodic.*'
-            block-level: 'NODE'
-        - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - '^xci-deploy.*'
+            - '^xci-functest.*'
+            - '^bifrost-.*periodic.*'
+            - '^osa-.*periodic.*'
+          block-level: 'NODE'
+      - logrotate-default
 
     wrappers:
-        - fix-workspace-permissions
+      - fix-workspace-permissions
 
     scm:
-        - git-scm
+      - git-scm
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{opnfv-releng-version}'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-ha'
-        - string:
-            name: XCI_FLAVOR
-            default: 'ha'
-        - string:
-            name: DISTRO
-            default: '{distro}'
-        - string:
-            name: DIB_OS_RELEASE
-            default: '{dib-os-release}'
-        - string:
-            name: DIB_OS_ELEMENT
-            default: '{dib-os-element}'
-        - string:
-            name: DIB_OS_PACKAGES
-            default: '{dib-os-packages}'
-        - string:
-            name: EXTRA_DIB_ELEMENTS
-            default: '{extra-dib-elements}'
-        - string:
-            name: CLEAN_DIB_IMAGES
-            default: 'true'
-        - label:
-            name: SLAVE_LABEL
-            default: '{slave-label}'
-        - string:
-            name: XCI_LOOP
-            default: 'daily'
-        - string:
-            name: INSTALLER_TYPE
-            default: 'osa'
-        - string:
-            name: FUNCTEST_MODE
-            default: 'daily'
-        - string:
-            name: FUNCTEST_SUITE_NAME
-            default: 'daily'
-            description: "Daily suite name to run"
+      - project-parameter:
+          project: '{project}'
+          branch: '{opnfv-releng-version}'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-ha'
+      - string:
+          name: XCI_FLAVOR
+          default: 'ha'
+      - string:
+          name: DISTRO
+          default: '{distro}'
+      - string:
+          name: DIB_OS_RELEASE
+          default: '{dib-os-release}'
+      - string:
+          name: DIB_OS_ELEMENT
+          default: '{dib-os-element}'
+      - string:
+          name: DIB_OS_PACKAGES
+          default: '{dib-os-packages}'
+      - string:
+          name: EXTRA_DIB_ELEMENTS
+          default: '{extra-dib-elements}'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - label:
+          name: SLAVE_LABEL
+          default: '{slave-label}'
+      - string:
+          name: XCI_LOOP
+          default: 'daily'
+      - string:
+          name: INSTALLER_TYPE
+          default: 'osa'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'daily'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'daily'
+          description: "Daily suite name to run"
+
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-        - 'xci-{phase}-builder'
+      - description-setter:
+          description: "Built on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
+      - 'xci-{phase}-builder'
 
-#---------------------------
+# --------------------------
 # builder macros
-#---------------------------
+# --------------------------
 - builder:
     name: xci-deploy-builder
     builders:
-        - shell:
-            !include-raw: ./xci-deploy.sh
+      - shell:
+          !include-raw: ./xci-deploy.sh
 
 - builder:
     name: xci-functest-builder
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            echo "Hello World!"
+          echo "Hello World!"
 
 # this will be enabled once the xci is prepared
-#- builder:
+# - builder:
 #    name: xci-functest-builder
 #    builders:
 #        - shell:
diff --git a/jjb/xci/xci-verify-jobs.yml b/jjb/xci/xci-verify-jobs.yml
index 17519aca7..3b399a7eb 100644
--- a/jjb/xci/xci-verify-jobs.yml
+++ b/jjb/xci/xci-verify-jobs.yml
@@ -1,55 +1,56 @@
+---
 - project:
     name: 'opnfv-xci-verify'
 
     project: releng-xci
-#--------------------------------
-# branches
-#--------------------------------
+    # -------------------------------
+    # branches
+    # -------------------------------
     stream:
-        - master:
-            branch: '{stream}'
-#--------------------------------
-# distros
-#--------------------------------
+      - master:
+          branch: '{stream}'
+    # -------------------------------
+    # distros
+    # -------------------------------
     distro:
-        - ubuntu:
-            disabled: false
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
-        - centos:
-            disabled: false
-            successful: true
-            failed: true
-            unstable: true
-            notbuilt: true
-        - opensuse:
-            disabled: false
-            successful: false
-            failed: false
-            unstable: false
-            notbuilt: false
-#--------------------------------
-# type
-#--------------------------------
+      - ubuntu:
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+      - centos:
+          disabled: false
+          successful: true
+          failed: true
+          unstable: true
+          notbuilt: true
+      - opensuse:
+          disabled: false
+          successful: false
+          failed: false
+          unstable: false
+          notbuilt: false
+    # -------------------------------
+    # type
+    # -------------------------------
     type:
-        - virtual
-#--------------------------------
-# patch verification phases
-#--------------------------------
+      - virtual
+    # -------------------------------
+    # patch verification phases
+    # -------------------------------
     phase:
-        - 'deploy'
-        - 'healthcheck'
-#--------------------------------
-# jobs
-#--------------------------------
+      - 'deploy'
+      - 'healthcheck'
+    # -------------------------------
+    # jobs
+    # -------------------------------
     jobs:
-        - 'xci-verify-{distro}-{type}-{stream}'
-        - 'xci-verify-{distro}-{phase}-{type}-{stream}'
-#--------------------------------
+      - 'xci-verify-{distro}-{type}-{stream}'
+      - 'xci-verify-{distro}-{phase}-{type}-{stream}'
+# -------------------------------
 # job templates
-#--------------------------------
+# -------------------------------
 - job-template:
     name: 'xci-verify-{distro}-{type}-{stream}'
 
@@ -60,127 +61,127 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'xci-verify-{distro}-.*'
-                - 'bifrost-verify-{distro}-.*'
-                - 'bifrost-periodic-{distro}-.*'
-                - 'osa-verify-{distro}-.*'
-                - 'osa-periodic-{distro}-.*'
-            block-level: 'NODE'
-        - throttle:
-            max-per-node: 2
-            max-total: 10
-            categories:
-                - xci-verify-virtual
-            option: category
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'xci-verify-{distro}-.*'
+            - 'bifrost-verify-{distro}-.*'
+            - 'bifrost-periodic-{distro}-.*'
+            - 'osa-verify-{distro}-.*'
+            - 'osa-periodic-{distro}-.*'
+          block-level: 'NODE'
+      - throttle:
+          max-per-node: 2
+          max-total: 10
+          categories:
+            - xci-verify-virtual
+          option: category
 
     wrappers:
-        - ssh-agent-wrapper
-        - build-timeout:
-            timeout: 240
-        - fix-workspace-permissions
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - 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: 'true'
-                - 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'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'bifrost/**'
-                  - compare-type: ANT
-                    pattern: 'xci/**'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'prototypes/**'
-                  - compare-type: ANT
-                    pattern: 'upstream/**'
-                  - compare-type: ANT
-                    pattern: '**/README.rst'
-                  - compare-type: ANT
-                    pattern: 'docs/**'
-            readable-message: true
-            skip-vote:
-                successful: '{obj:successful}'
-                failed: '{obj:failed}'
-                unstable: '{obj:unstable}'
-                notbuilt: '{obj:notbuilt}'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'true'
+            - 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'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'bifrost/**'
+                - compare-type: ANT
+                  pattern: 'xci/**'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'prototypes/**'
+                - compare-type: ANT
+                  pattern: 'upstream/**'
+                - compare-type: ANT
+                  pattern: '**/README.rst'
+                - compare-type: ANT
+                  pattern: 'docs/**'
+          readable-message: true
+          skip-vote:
+            successful: '{obj:successful}'
+            failed: '{obj:failed}'
+            unstable: '{obj:unstable}'
+            notbuilt: '{obj:notbuilt}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - label:
-            name: SLAVE_LABEL
-            default: 'xci-virtual'
-        - string:
-            name: CLEAN_DIB_IMAGES
-            default: 'true'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - label:
+          name: SLAVE_LABEL
+          default: 'xci-virtual'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - multijob:
-            name: deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: 'xci-verify-{distro}-deploy-{type}-{stream}'
-                  current-parameters: true
-                  predefined-parameters: |
-                    DISTRO={distro}
-                    DEPLOY_SCENARIO=os-nosdn-nofeature-noha
-                    CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: healthcheck
-            condition: SUCCESSFUL
-            projects:
-                - name: 'xci-verify-{distro}-healthcheck-{type}-{stream}'
-                  current-parameters: true
-                  predefined-parameters: |
-                    DISTRO={distro}
-                    DEPLOY_SCENARIO=os-nosdn-nofeature-noha
-                    CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-                    FUNCTEST_MODE=tier
-                    FUNCTEST_TIER=healthcheck
-                    GERRIT_BRANCH=$GERRIT_BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  node-parameters: true
-                  kill-phase-on: NEVER
-                  abort-all-job: true
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: deploy
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-verify-{distro}-deploy-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: healthcheck
+          condition: SUCCESSFUL
+          projects:
+            - name: 'xci-verify-{distro}-healthcheck-{type}-{stream}'
+              current-parameters: true
+              predefined-parameters: |
+                DISTRO={distro}
+                DEPLOY_SCENARIO=os-nosdn-nofeature-noha
+                CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+                FUNCTEST_MODE=tier
+                FUNCTEST_TIER=healthcheck
+                GERRIT_BRANCH=$GERRIT_BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              node-parameters: true
+              kill-phase-on: NEVER
+              abort-all-job: true
 
 - job-template:
     name: 'xci-verify-{distro}-{phase}-{type}-{stream}'
@@ -190,142 +191,142 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'bifrost-verify-.*'
-                - 'bifrost-periodic-.*'
-                - 'osa-verify-.*'
-                - 'osa-periodic-.*'
-            block-level: 'NODE'
+      - logrotate-default
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'bifrost-verify-.*'
+            - 'bifrost-periodic-.*'
+            - 'osa-verify-.*'
+            - 'osa-periodic-.*'
+          block-level: 'NODE'
 
     parameters:
-        - string:
-            name: PROJECT
-            default: 'releng-xci'
-        - string:
-            name: DISTRO
-            default: 'ubuntu'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-nosdn-nofeature-noha'
-        - string:
-            name: FUNCTEST_MODE
-            default: 'tier'
-        - string:
-            name: FUNCTEST_SUITE_NAME
-            default: 'healthcheck'
-        - string:
-            name: XCI_FLAVOR
-            default: 'mini'
-        - string:
-            name: CLEAN_DIB_IMAGES
-            default: 'true'
-        - string:
-            name: OPNFV_RELENG_DEV_PATH
-            default: $WORKSPACE/
-        - string:
-            name: INSTALLER_TYPE
-            default: 'osa'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/$PROJECT
-            description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: PROJECT
+          default: 'releng-xci'
+      - string:
+          name: DISTRO
+          default: 'ubuntu'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: FUNCTEST_MODE
+          default: 'tier'
+      - string:
+          name: FUNCTEST_SUITE_NAME
+          default: 'healthcheck'
+      - string:
+          name: XCI_FLAVOR
+          default: 'mini'
+      - string:
+          name: CLEAN_DIB_IMAGES
+          default: 'true'
+      - string:
+          name: OPNFV_RELENG_DEV_PATH
+          default: $WORKSPACE/
+      - string:
+          name: INSTALLER_TYPE
+          default: 'osa'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
 
     wrappers:
-        - ssh-agent-wrapper
-        - build-timeout:
-            timeout: 240
-        - fix-workspace-permissions
+      - ssh-agent-wrapper
+      - build-timeout:
+          timeout: 240
+      - fix-workspace-permissions
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - 'xci-verify-{phase}-macro'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - 'xci-verify-{phase}-macro'
 
-#--------------------------------
+# -------------------------------
 # builder macros
-#--------------------------------
+# -------------------------------
 - builder:
     name: 'xci-verify-deploy-macro'
     builders:
-        - shell: |
-            #!/bin/bash
-
-            # skip the deployment if the patch doesn't impact the deployment
-            if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
-                echo "Skipping the deployment!"
-                exit 0
-            fi
-
-            cd $WORKSPACE
-
-            # The start-new-vm.sh script will copy the entire releng-xci directory
-            # so lets prepare the test script now so it can be copied by the script.
-            # Please do not move it elsewhere or you would have to move it to the VM
-            # yourself.
-            cat > xci_test.sh<<EOF
-            #!/bin/bash
-            export DISTRO=$DISTRO
-            export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-            export FUNCTEST_MODE=$FUNCTEST_MODE
-            export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-            export XCI_FLAVOR=$XCI_FLAVOR
-            export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
-            export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
-            export INSTALLER_TYPE=$INSTALLER_TYPE
-            export GIT_BASE=$GIT_BASE
-            export JENKINS_HOME=$JENKINS_HOME
-
-            cd xci
-            ./xci-deploy.sh
-            EOF
-            chmod a+x xci_test.sh
-
-            ./xci/scripts/vm/start-new-vm.sh $DISTRO
-        - shell: |
-            #!/bin/bash
-
-            # skip the deployment if the patch doesn't impact the deployment
-            if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
-                echo "Skipping the deployment!"
-                exit 0
-            fi
-
-            ssh ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
+      - shell: |
+          #!/bin/bash
+
+          # skip the deployment if the patch doesn't impact the deployment
+          if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+              echo "Skipping the deployment!"
+              exit 0
+          fi
+
+          cd $WORKSPACE
+
+          # The start-new-vm.sh script will copy the entire releng-xci directory
+          # so lets prepare the test script now so it can be copied by the script.
+          # Please do not move it elsewhere or you would have to move it to the VM
+          # yourself.
+          cat > xci_test.sh<<EOF
+          #!/bin/bash
+          export DISTRO=$DISTRO
+          export DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+          export FUNCTEST_MODE=$FUNCTEST_MODE
+          export FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
+          export XCI_FLAVOR=$XCI_FLAVOR
+          export CLEAN_DIB_IMAGES=$CLEAN_DIB_IMAGES
+          export OPNFV_RELENG_DEV_PATH=/home/devuser/releng-xci/
+          export INSTALLER_TYPE=$INSTALLER_TYPE
+          export GIT_BASE=$GIT_BASE
+          export JENKINS_HOME=$JENKINS_HOME
+
+          cd xci
+          ./xci-deploy.sh
+          EOF
+          chmod a+x xci_test.sh
+
+          ./xci/scripts/vm/start-new-vm.sh $DISTRO
+      - shell: |
+          #!/bin/bash
+
+          # skip the deployment if the patch doesn't impact the deployment
+          if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+              echo "Skipping the deployment!"
+              exit 0
+          fi
+
+          ssh ${DISTRO}_xci_vm "cd releng-xci && ./xci_test.sh"
 
 
 - builder:
     name: 'xci-verify-healthcheck-macro'
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            # skip the healthcheck if the patch doesn't impact the deployment
-            if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
-                echo "Skipping the healthcheck!"
-                exit 0
-            fi
+          # skip the healthcheck if the patch doesn't impact the deployment
+          if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+              echo "Skipping the healthcheck!"
+              exit 0
+          fi
 
-            echo "Hello World!"
-        - shell: |
-            #!/bin/bash
+          echo "Hello World!"
+      - shell: |
+          #!/bin/bash
 
-            # skip the deployment if the patch doesn't impact the deployment
-            if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
-                echo "Skipping the deployment!"
-                exit 0
-            fi
+          # skip the deployment if the patch doesn't impact the deployment
+          if [[ "$GERRIT_TOPIC" =~ 'skip-verify' ]]; then
+              echo "Skipping the deployment!"
+              exit 0
+          fi
 
-            sudo virsh destroy ${DISTRO}_xci_vm
-            sudo virsh undefine ${DISTRO}_xci_vm
+          sudo virsh destroy ${DISTRO}_xci_vm
+          sudo virsh undefine ${DISTRO}_xci_vm
 
 # this will be enabled once the xci is prepared
-#- builder:
+# - builder:
 #    name: 'xci-verify-healthcheck-macro'
 #    builders:
 #        - shell: