Fix Yamllint violations for jjb/releng

JIRA: RELENG-254

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

8 files changed, 821 insertions, 807 deletions

diff --git a/jjb/releng/artifact-cleanup.yml b/jjb/releng/artifact-cleanup.yml
index 2d0205660..2a250618c 100644
--- a/jjb/releng/artifact-cleanup.yml
+++ b/jjb/releng/artifact-cleanup.yml
@@ -1,15 +1,16 @@
+---
 - project:
     name: releng-artifact-cleanup
 
     project: 'releng'
 
     jobs:
-        - 'releng-artifact-cleanup-daily-{stream}'
+      - 'releng-artifact-cleanup-daily-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
 
 
 - job-template:
@@ -25,16 +26,16 @@
     disabled: false
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - timed: 'H H * * *'
+      - timed: 'H H * * *'
 
     builders:
-        - shell: |
-            $WORKSPACE/utils/retention_script.sh
+      - shell: |
+          $WORKSPACE/utils/retention_script.sh
diff --git a/jjb/releng/automate.yml b/jjb/releng/automate.yml
index 908e9a196..c7e34b20c 100644
--- a/jjb/releng/automate.yml
+++ b/jjb/releng/automate.yml
@@ -1,22 +1,23 @@
+---
 - project:
     name: utils-automate
     stream:
-        - master:
-            branch: '{stream}'
+      - master:
+          branch: '{stream}'
 
     module:
-        - 'testapi'
-        - 'reporting'
+      - 'testapi'
+      - 'reporting'
 
     phase:
-        - 'docker-deploy':
-            slave-label: 'testresults'
-        - 'generate-doc'
+      - 'docker-deploy':
+          slave-label: 'testresults'
+      - 'generate-doc'
 
     jobs:
-        - '{module}-automate-{stream}'
-        - '{module}-automate-{phase}-{stream}'
-        - '{module}-verify-{stream}'
+      - '{module}-automate-{stream}'
+      - '{module}-automate-{phase}-{stream}'
+      - '{module}-verify-{stream}'
 
     project: 'releng'
 
@@ -24,73 +25,73 @@
     name: 'testapi-mongodb-backup'
 
     parameters:
-        - label:
-            name: SLAVE_LABEL
-            default: 'testresults'
-            description: 'Slave label on Jenkins'
-        - project-parameter:
-            project: 'releng'
-            branch: 'master'
-        - string:
-            name: GIT_BASE
-            default: https://gerrit.opnfv.org/gerrit/releng
-            description: 'Git URL to use on this Jenkins Slave'
+      - label:
+          name: SLAVE_LABEL
+          default: 'testresults'
+          description: 'Slave label on Jenkins'
+      - project-parameter:
+          project: 'releng'
+          branch: 'master'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/releng
+          description: 'Git URL to use on this Jenkins Slave'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - timed: '@weekly'
+      - timed: '@weekly'
 
     builders:
-        - mongodb-backup
+      - mongodb-backup
 
 - job-template:
     name: '{module}-verify-{stream}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'utils/test/{module}/**'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: 'utils/test/{module}/**'
 
     builders:
-        - shell: |
-            cd ./utils/test/{module}/
-            tox
-            if [ -e *.xml ];then
-                cp *.xml $WORKSPACE
-            fi
+      - shell: |
+          cd ./utils/test/{module}/
+          tox
+          if [ -e *.xml ];then
+              cp *.xml $WORKSPACE
+          fi
 
     publishers:
-        - publish-coverage
-        - email-jenkins-admins-on-failure
+      - publish-coverage
+      - email-jenkins-admins-on-failure
 
 - job-template:
     name: '{module}-automate-{stream}'
@@ -98,108 +99,108 @@
     project-type: multijob
 
     properties:
-        - throttle:
-            enabled: true
-            max-total: 1
-            max-per-node: 1
-            option: 'project'
+      - throttle:
+          enabled: true
+          max-total: 1
+          max-per-node: 1
+          option: 'project'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - string:
-            name: DOCKER_TAG
-            default: 'latest'
-            description: 'Tag name for {module} docker image'
-        - string:
-            name: MODULE_NAME
-            default: '{module}'
-            description: "Name of the module"
-        - 'opnfv-build-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - string:
+          name: DOCKER_TAG
+          default: 'latest'
+          description: 'Tag name for {module} docker image'
+      - string:
+          name: MODULE_NAME
+          default: '{module}'
+          description: "Name of the module"
+      - 'opnfv-build-defaults'
 
     scm:
-        - git-scm
+      - git-scm
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 360
-            fail: true
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
 
     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}'
-                file-paths:
-                  - compare-type: 'ANT'
-                    pattern: 'utils/test/{module}/**'
+      - 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}'
+              file-paths:
+                - compare-type: 'ANT'
+                  pattern: 'utils/test/{module}/**'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - docker-update
-        - multijob:
-            name: docker-deploy
-            condition: SUCCESSFUL
-            projects:
-                - name: '{module}-automate-docker-deploy-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    GIT_BASE=$GIT_BASE
-                  node-label-name: SLAVE_LABEL
-                  node-label: testresults
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: generate-doc
-            condition: SUCCESSFUL
-            projects:
-                - name: '{module}-automate-generate-doc-{stream}'
-                  current-parameters: true
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - docker-update
+      - multijob:
+          name: docker-deploy
+          condition: SUCCESSFUL
+          projects:
+            - name: '{module}-automate-docker-deploy-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                GIT_BASE=$GIT_BASE
+              node-label-name: SLAVE_LABEL
+              node-label: testresults
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: generate-doc
+          condition: SUCCESSFUL
+          projects:
+            - name: '{module}-automate-generate-doc-{stream}'
+              current-parameters: true
+              kill-phase-on: FAILURE
+              abort-all-job: true
 
     publishers:
-        - 'email-publisher'
-        - email-jenkins-admins-on-failure
+      - 'email-publisher'
+      - email-jenkins-admins-on-failure
 
 - job-template:
     name: '{module}-automate-{phase}-{stream}'
 
     properties:
-        - throttle:
-            enabled: true
-            max-per-node: 1
-            option: 'project'
+      - throttle:
+          enabled: true
+          max-per-node: 1
+          option: 'project'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 120
-            fail: true
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 120
+          fail: true
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - '{module}-automate-{phase}-macro'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{module}-automate-{phase}-macro'
 
 ################################
 # job builders
@@ -207,53 +208,53 @@
 - builder:
     name: 'docker-update'
     builders:
-        - shell:
-            !include-raw: ./docker-update.sh
+      - shell:
+          !include-raw: ./docker-update.sh
 
 - builder:
     name: 'testapi-automate-generate-doc-macro'
     builders:
-        - 'testapi-doc-build'
-        - 'upload-doc-artifact'
+      - 'testapi-doc-build'
+      - 'upload-doc-artifact'
 
 - builder:
     name: 'testapi-doc-build'
     builders:
-        - shell: |
-            bash ./utils/test/testapi/htmlize/doc-build.sh
+      - shell: |
+          bash ./utils/test/testapi/htmlize/doc-build.sh
 
 - builder:
     name: 'upload-doc-artifact'
     builders:
-        - shell: |
-            bash ./utils/test/testapi/htmlize/push-doc-artifact.sh
+      - shell: |
+          bash ./utils/test/testapi/htmlize/push-doc-artifact.sh
 
 - builder:
     name: 'reporting-automate-generate-doc-macro'
     builders:
-        - shell: echo "To Be Done"
+      - shell: echo "To Be Done"
 
 - builder:
     name: 'testapi-automate-docker-deploy-macro'
     builders:
-        - shell: |
-            sudo bash ./jjb/releng/docker-deploy.sh "sudo docker run -dti --name testapi -p 8082:8000
-            -e mongodb_url=mongodb://172.17.0.1:27017
-            -e base_url=http://testresults.opnfv.org/test opnfv/testapi" \
-            "http://testresults.opnfv.org/test/" "testapi"
+      - shell: |
+          sudo bash ./jjb/releng/docker-deploy.sh "sudo docker run -dti --name testapi -p 8082:8000
+          -e mongodb_url=mongodb://172.17.0.1:27017
+          -e base_url=http://testresults.opnfv.org/test opnfv/testapi" \
+          "http://testresults.opnfv.org/test/" "testapi"
 
 - builder:
     name: 'reporting-automate-docker-deploy-macro'
     builders:
-        - shell: |
-            sudo bash ./jjb/releng/docker-deploy.sh "sudo docker run -itd --name reporting -p 8084:8000 opnfv/reporting" \
-            "http://testresults.opnfv.org/reporting/index.html" "reporting"
+      - shell: |
+          sudo bash ./jjb/releng/docker-deploy.sh "sudo docker run -itd --name reporting -p 8084:8000 opnfv/reporting" \
+          "http://testresults.opnfv.org/reporting/index.html" "reporting"
 
 - builder:
     name: mongodb-backup
     builders:
-        - shell: |
-            bash ./jjb/releng/testapi-backup-mongodb.sh
+      - shell: |
+          bash ./jjb/releng/testapi-backup-mongodb.sh
 
 ################################
 # job publishers
@@ -262,7 +263,7 @@
 - publisher:
     name: 'email-publisher'
     publishers:
-        - email:
-            recipients: rohitsakala@gmail.com feng.xiaowei@zte.com.cn morgan.richomme@orange.com
-            notify-every-unstable-build: false
-            send-to-individuals: true
+      - email:
+          recipients: rohitsakala@gmail.com feng.xiaowei@zte.com.cn morgan.richomme@orange.com
+          notify-every-unstable-build: false
+          send-to-individuals: true
diff --git a/jjb/releng/opnfv-docker-arm.yml b/jjb/releng/opnfv-docker-arm.yml
index 7f2574ec4..b488592db 100644
--- a/jjb/releng/opnfv-docker-arm.yml
+++ b/jjb/releng/opnfv-docker-arm.yml
@@ -1,3 +1,4 @@
+---
 ##############################################
 # job configuration for docker build and push
 ##############################################
@@ -7,153 +8,155 @@
     name: opnfv-docker-arm
 
     master: &master
-        stream: master
-        branch: '{stream}'
-        disabled: false
+      stream: master
+      branch: '{stream}'
+      disabled: false
     euphrates: &euphrates
-        stream: euphrates
-        branch: 'stable/{stream}'
-        disabled: false
+      stream: euphrates
+      branch: 'stable/{stream}'
+      disabled: false
     functest-arm-receivers: &functest-arm-receivers
-        receivers: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            delia.popescu@enea.com
+      receivers: >
+          cristina.pauna@enea.com
+          alexandru.avadanii@enea.com
+          delia.popescu@enea.com
     dovetail-arm-receivers: &dovetail-arm-receivers
-        receivers: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            alexandru.nemes@enea.com
+      receivers: >
+          cristina.pauna@enea.com
+          alexandru.avadanii@enea.com
+          alexandru.nemes@enea.com
     storperf-arm-receivers: &storperf-arm-receivers
-        receivers: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            mark.beierl@emc.com
+      receivers: >
+          cristina.pauna@enea.com
+          alexandru.avadanii@enea.com
+          mark.beierl@emc.com
     yardstick-arm-receivers: &yardstick-arm-receivers
-        receivers: >
-            cristina.pauna@enea.com
-            alexandru.avadanii@enea.com
-            alexandru.nemes@enea.com
-            catalina.focsa@enea.com
-            delia.popescu@enea.com
+      receivers: >
+          cristina.pauna@enea.com
+          alexandru.avadanii@enea.com
+          alexandru.nemes@enea.com
+          catalina.focsa@enea.com
+          delia.popescu@enea.com
     other-receivers: &other-receivers
-        receivers: ''
+      receivers: ''
 
     dockerfile: "Dockerfile.aarch64"
     dockerdir: "docker"
     docker_repo_name: "opnfv/{project}_aarch64"
     arch_tag: ""
 
+    # yamllint disable rule:key-duplicates
     dockerrepo:
-        # projects with jobs for master
-        - 'functest':
-            project: 'functest'
-            <<: *master
-            <<: *functest-arm-receivers
-        - 'dovetail':
-            project: 'dovetail'
-            <<: *master
-            <<: *dovetail-arm-receivers
-        - 'storperf-master':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-master'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-master'
-            arch_tag: 'aarch64'
-            <<: *master
-            <<: *storperf-arm-receivers
-        - 'storperf-graphite':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-graphite'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-graphite'
-            arch_tag: 'aarch64'
-            <<: *master
-            <<: *storperf-arm-receivers
-        - 'storperf-httpfrontend':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-httpfrontend'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-httpfrontend'
-            arch_tag: 'aarch64'
-            <<: *master
-            <<: *storperf-arm-receivers
-        - 'storperf-reporting':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-reporting'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-reporting'
-            arch_tag: 'aarch64'
-            <<: *master
-            <<: *storperf-arm-receivers
-        - 'storperf-swaggerui':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-swaggerui'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-swaggerui'
-            arch_tag: 'aarch64'
-            <<: *master
-            <<: *storperf-arm-receivers
-        - 'yardstick':
-            project: 'yardstick'
-            <<: *master
-            <<: *yardstick-arm-receivers
-        # projects with jobs for stable/euphrates
-        - 'functest':
-            project: 'functest'
-            <<: *euphrates
-            <<: *functest-arm-receivers
-        - 'dovetail':
-            project: 'dovetail'
-            <<: *euphrates
-            <<: *dovetail-arm-receivers
-        - 'storperf-master':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-master'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-master'
-            arch_tag: 'aarch64'
-            <<: *euphrates
-            <<: *storperf-arm-receivers
-        - 'storperf-graphite':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-graphite'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-graphite'
-            arch_tag: 'aarch64'
-            <<: *euphrates
-            <<: *storperf-arm-receivers
-        - 'storperf-httpfrontend':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-httpfrontend'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-httpfrontend'
-            arch_tag: 'aarch64'
-            <<: *euphrates
-            <<: *storperf-arm-receivers
-        - 'storperf-reporting':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-reporting'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-reporting'
-            arch_tag: 'aarch64'
-            <<: *euphrates
-            <<: *storperf-arm-receivers
-        - 'storperf-swaggerui':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-swaggerui'
-            dockerfile: 'Dockerfile'
-            docker_repo_name: 'opnfv/storperf-swaggerui'
-            arch_tag: 'aarch64'
-            <<: *euphrates
-            <<: *storperf-arm-receivers
-        - 'yardstick':
-            project: 'yardstick'
-            <<: *euphrates
-            <<: *yardstick-arm-receivers
+      # projects with jobs for master
+      - 'functest':
+          project: 'functest'
+          <<: *master
+          <<: *functest-arm-receivers
+      - 'dovetail':
+          project: 'dovetail'
+          <<: *master
+          <<: *dovetail-arm-receivers
+      - 'storperf-master':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-master'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-master'
+          arch_tag: 'aarch64'
+          <<: *master
+          <<: *storperf-arm-receivers
+      - 'storperf-graphite':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-graphite'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-graphite'
+          arch_tag: 'aarch64'
+          <<: *master
+          <<: *storperf-arm-receivers
+      - 'storperf-httpfrontend':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-httpfrontend'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-httpfrontend'
+          arch_tag: 'aarch64'
+          <<: *master
+          <<: *storperf-arm-receivers
+      - 'storperf-reporting':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-reporting'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-reporting'
+          arch_tag: 'aarch64'
+          <<: *master
+          <<: *storperf-arm-receivers
+      - 'storperf-swaggerui':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-swaggerui'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-swaggerui'
+          arch_tag: 'aarch64'
+          <<: *master
+          <<: *storperf-arm-receivers
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *master
+          <<: *yardstick-arm-receivers
+      # projects with jobs for stable/euphrates
+      - 'functest':
+          project: 'functest'
+          <<: *euphrates
+          <<: *functest-arm-receivers
+      - 'dovetail':
+          project: 'dovetail'
+          <<: *euphrates
+          <<: *dovetail-arm-receivers
+      - 'storperf-master':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-master'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-master'
+          arch_tag: 'aarch64'
+          <<: *euphrates
+          <<: *storperf-arm-receivers
+      - 'storperf-graphite':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-graphite'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-graphite'
+          arch_tag: 'aarch64'
+          <<: *euphrates
+          <<: *storperf-arm-receivers
+      - 'storperf-httpfrontend':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-httpfrontend'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-httpfrontend'
+          arch_tag: 'aarch64'
+          <<: *euphrates
+          <<: *storperf-arm-receivers
+      - 'storperf-reporting':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-reporting'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-reporting'
+          arch_tag: 'aarch64'
+          <<: *euphrates
+          <<: *storperf-arm-receivers
+      - 'storperf-swaggerui':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-swaggerui'
+          dockerfile: 'Dockerfile'
+          docker_repo_name: 'opnfv/storperf-swaggerui'
+          arch_tag: 'aarch64'
+          <<: *euphrates
+          <<: *storperf-arm-receivers
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *euphrates
+          <<: *yardstick-arm-receivers
 
+    # yamllint enable rule:key-duplicates
     jobs:
-        - '{dockerrepo}-docker-build-arm-push-{stream}'
+      - '{dockerrepo}-docker-build-arm-push-{stream}'
 
 ########################
 # job templates
@@ -164,52 +167,52 @@
     disabled: '{obj:disabled}'
 
     parameters: &parameters
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-arm-defaults'
-        - string:
-            name: PUSH_IMAGE
-            default: "true"
-            description: "To enable/disable pushing the image to Dockerhub."
-        - string:
-            name: DOCKER_REPO_NAME
-            default: "{docker_repo_name}"
-            description: "Dockerhub repo to be pushed to."
-        - string:
-            name: RELEASE_VERSION
-            default: ""
-            description: "Release version, e.g. 1.0, 2.0, 3.0"
-        - string:
-            name: DOCKER_DIR
-            default: "{dockerdir}"
-            description: "Directory containing files needed by the Dockerfile"
-        - string:
-            name: DOCKERFILE
-            default: "{dockerfile}"
-            description: "Dockerfile to use for creating the image."
-        - string:
-            name: ARCH_TAG
-            default: "{arch_tag}"
-            description: "If set, this value will be added to the docker image tag"
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-arm-defaults'
+      - string:
+          name: PUSH_IMAGE
+          default: "true"
+          description: "To enable/disable pushing the image to Dockerhub."
+      - string:
+          name: DOCKER_REPO_NAME
+          default: "{docker_repo_name}"
+          description: "Dockerhub repo to be pushed to."
+      - string:
+          name: RELEASE_VERSION
+          default: ""
+          description: "Release version, e.g. 1.0, 2.0, 3.0"
+      - string:
+          name: DOCKER_DIR
+          default: "{dockerdir}"
+          description: "Directory containing files needed by the Dockerfile"
+      - string:
+          name: DOCKERFILE
+          default: "{dockerfile}"
+          description: "Dockerfile to use for creating the image."
+      - string:
+          name: ARCH_TAG
+          default: "{arch_tag}"
+          description: "If set, this value will be added to the docker image tag"
 
     properties:
-        - throttle:
-            max-per-node: 1
-            option: 'project'
+      - throttle:
+          max-per-node: 1
+          option: 'project'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders: &builders
-        - shell:
-            !include-raw-escape: ./opnfv-docker.sh
+      - shell:
+          !include-raw-escape: ./opnfv-docker.sh
 
     triggers:
-        - pollscm:
-            cron: "*/30 * * * *"
+      - pollscm:
+          cron: "*/30 * * * *"
 
     publishers:
-        - email:
-            recipients: '{receivers}'
-        - email-jenkins-admins-on-failure
+      - email:
+          recipients: '{receivers}'
+      - email-jenkins-admins-on-failure
diff --git a/jjb/releng/opnfv-docker.yml b/jjb/releng/opnfv-docker.yml
index 1a3db3a5f..f0020aea3 100644
--- a/jjb/releng/opnfv-docker.yml
+++ b/jjb/releng/opnfv-docker.yml
@@ -1,3 +1,4 @@
+---
 ##############################################
 # job configuration for docker build and push
 ##############################################
@@ -7,27 +8,27 @@
     name: opnfv-docker
 
     master: &master
-        stream: master
-        branch: '{stream}'
-        disabled: false
+      stream: master
+      branch: '{stream}'
+      disabled: false
     danube: &danube
-        stream: danube
-        branch: 'stable/{stream}'
-        disabled: false
+      stream: danube
+      branch: 'stable/{stream}'
+      disabled: false
     euphrates: &euphrates
-        stream: euphrates
-        branch: 'stable/{stream}'
-        disabled: false
+      stream: euphrates
+      branch: 'stable/{stream}'
+      disabled: false
     functest-receivers: &functest-receivers
-        receivers: >
-            jalausuch@suse.com morgan.richomme@orange.com
-            cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
-            juha.kosonen@nokia.com wangwulin@huawei.com
+      receivers: >
+          jalausuch@suse.com morgan.richomme@orange.com
+          cedric.ollivier@orange.com feng.xiaowei@zte.com.cn
+          juha.kosonen@nokia.com wangwulin@huawei.com
     storperf-receivers: &storperf-receivers
-        receivers: >
-            mark.beierl@emc.com
+      receivers: >
+          mark.beierl@emc.com
     other-receivers: &other-receivers
-        receivers: ''
+      receivers: ''
 
     dockerfile: "Dockerfile"
     dockerdir: "docker"
@@ -36,126 +37,127 @@
     # This is the dockerhub repo the image will be pushed to as
     # 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter.
     # 'project' is the OPNFV repo we expect to contain the Dockerfile
+    # yamllint disable rule:key-duplicates
     dockerrepo:
-        # projects with jobs for master
-        - 'releng-anteater':
-            project: 'releng-anteater'
-            <<: *master
-            <<: *other-receivers
-        - 'bottlenecks':
-            project: 'bottlenecks'
-            <<: *master
-            <<: *other-receivers
-        - 'cperf':
-            project: 'cperf'
-            <<: *master
-            <<: *other-receivers
-        - 'dovetail':
-            project: 'dovetail'
-            <<: *master
-            <<: *other-receivers
-        - 'functest':
-            project: 'functest'
-            <<: *master
-            <<: *functest-receivers
-        - 'nfvbench':
-            project: 'nfvbench'
-            <<: *master
-            <<: *other-receivers
-        - 'qtip':
-            project: 'qtip'
-            <<: *master
-            <<: *other-receivers
-        - 'storperf-master':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-master'
-            arch_tag: 'x86_64'
-            <<: *master
-            <<: *storperf-receivers
-        - 'storperf-graphite':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-graphite'
-            arch_tag: 'x86_64'
-            <<: *master
-            <<: *storperf-receivers
-        - 'storperf-httpfrontend':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-httpfrontend'
-            arch_tag: 'x86_64'
-            <<: *master
-            <<: *storperf-receivers
-        - 'storperf-reporting':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-reporting'
-            arch_tag: 'x86_64'
-            <<: *master
-            <<: *storperf-receivers
-        - 'storperf-swaggerui':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-swaggerui'
-            arch_tag: 'x86_64'
-            <<: *master
-            <<: *storperf-receivers
-        - 'yardstick':
-            project: 'yardstick'
-            <<: *master
-            <<: *other-receivers
-        # projects with jobs for Danube
-        - 'qtip':
-            project: 'qtip'
-            <<: *euphrates
-            <<: *other-receivers
-        - 'yardstick':
-            project: 'yardstick'
-            <<: *euphrates
-            <<: *other-receivers
-        # projects with jobs for euphrates
-        - 'bottlenecks':
-            project: 'bottlenecks'
-            <<: *euphrates
-            <<: *other-receivers
-        - 'functest':
-            project: 'functest'
-            <<: *euphrates
-            <<: *functest-receivers
-        - 'storperf-master':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-master'
-            arch_tag: 'x86_64'
-            <<: *euphrates
-            <<: *storperf-receivers
-        - 'storperf-graphite':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-graphite'
-            arch_tag: 'x86_64'
-            <<: *euphrates
-            <<: *storperf-receivers
-        - 'storperf-httpfrontend':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-httpfrontend'
-            arch_tag: 'x86_64'
-            <<: *euphrates
-            <<: *storperf-receivers
-        - 'storperf-reporting':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-reporting'
-            arch_tag: 'x86_64'
-            <<: *euphrates
-            <<: *storperf-receivers
-        - 'storperf-swaggerui':
-            project: 'storperf'
-            dockerdir: 'docker/storperf-swaggerui'
-            arch_tag: 'x86_64'
-            <<: *euphrates
-            <<: *storperf-receivers
-        - 'nfvbench':
-            project: 'nfvbench'
-            <<: *euphrates
-            <<: *other-receivers
+      # projects with jobs for master
+      - 'releng-anteater':
+          project: 'releng-anteater'
+          <<: *master
+          <<: *other-receivers
+      - 'bottlenecks':
+          project: 'bottlenecks'
+          <<: *master
+          <<: *other-receivers
+      - 'cperf':
+          project: 'cperf'
+          <<: *master
+          <<: *other-receivers
+      - 'dovetail':
+          project: 'dovetail'
+          <<: *master
+          <<: *other-receivers
+      - 'functest':
+          project: 'functest'
+          <<: *master
+          <<: *functest-receivers
+      - 'nfvbench':
+          project: 'nfvbench'
+          <<: *master
+          <<: *other-receivers
+      - 'qtip':
+          project: 'qtip'
+          <<: *master
+          <<: *other-receivers
+      - 'storperf-master':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-master'
+          arch_tag: 'x86_64'
+          <<: *master
+          <<: *storperf-receivers
+      - 'storperf-graphite':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-graphite'
+          arch_tag: 'x86_64'
+          <<: *master
+          <<: *storperf-receivers
+      - 'storperf-httpfrontend':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-httpfrontend'
+          arch_tag: 'x86_64'
+          <<: *master
+          <<: *storperf-receivers
+      - 'storperf-reporting':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-reporting'
+          arch_tag: 'x86_64'
+          <<: *master
+          <<: *storperf-receivers
+      - 'storperf-swaggerui':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-swaggerui'
+          arch_tag: 'x86_64'
+          <<: *master
+          <<: *storperf-receivers
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *master
+          <<: *other-receivers
+      # projects with jobs for Danube
+      - 'qtip':
+          project: 'qtip'
+          <<: *euphrates
+          <<: *other-receivers
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *euphrates
+          <<: *other-receivers
+      # projects with jobs for euphrates
+      - 'bottlenecks':
+          project: 'bottlenecks'
+          <<: *euphrates
+          <<: *other-receivers
+      - 'functest':
+          project: 'functest'
+          <<: *euphrates
+          <<: *functest-receivers
+      - 'storperf-master':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-master'
+          arch_tag: 'x86_64'
+          <<: *euphrates
+          <<: *storperf-receivers
+      - 'storperf-graphite':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-graphite'
+          arch_tag: 'x86_64'
+          <<: *euphrates
+          <<: *storperf-receivers
+      - 'storperf-httpfrontend':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-httpfrontend'
+          arch_tag: 'x86_64'
+          <<: *euphrates
+          <<: *storperf-receivers
+      - 'storperf-reporting':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-reporting'
+          arch_tag: 'x86_64'
+          <<: *euphrates
+          <<: *storperf-receivers
+      - 'storperf-swaggerui':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-swaggerui'
+          arch_tag: 'x86_64'
+          <<: *euphrates
+          <<: *storperf-receivers
+      - 'nfvbench':
+          project: 'nfvbench'
+          <<: *euphrates
+          <<: *other-receivers
 
+    # yamllint enable rule:key-duplicates
     jobs:
-        - "{dockerrepo}-docker-build-push-{stream}"
-
+      - "{dockerrepo}-docker-build-push-{stream}"
 
 - project:
 
@@ -166,16 +168,16 @@
     arch_tag: ""
 
     project:
-        # projects with jobs for master
-        - 'daisy':
-            dockerrepo: 'daisy'
-            <<: *master
-        - 'escalator':
-            dockerrepo: 'escalator'
-            <<: *master
+      # projects with jobs for master
+      - 'daisy':
+          dockerrepo: 'daisy'
+          <<: *master
+      - 'escalator':
+          dockerrepo: 'escalator'
+          <<: *master
 
     jobs:
-        - '{project}-docker-build-push-monitor-{stream}'
+      - '{project}-docker-build-push-monitor-{stream}'
 
 ########################
 # job templates
@@ -186,82 +188,83 @@
     disabled: '{obj:disabled}'
 
     parameters: &parameters
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
-        - string:
-            name: PUSH_IMAGE
-            default: "true"
-            description: "To enable/disable pushing the image to Dockerhub."
-        - string:
-            name: DOCKER_REPO_NAME
-            default: "opnfv/{dockerrepo}"
-            description: "Dockerhub repo to be pushed to."
-        - string:
-            name: DOCKER_DIR
-            default: "{dockerdir}"
-            description: "Directory containing files needed by the Dockerfile"
-        - string:
-            name: COMMIT_ID
-            default: ""
-            description: "commit id to make a snapshot docker image"
-        - string:
-            name: RELEASE_VERSION
-            default: ""
-            description: "Release version, e.g. 1.0, 2.0, 3.0"
-        - string:
-            name: DOCKERFILE
-            default: "{dockerfile}"
-            description: "Dockerfile to use for creating the image."
-        - string:
-            name: ARCH_TAG
-            default: "{arch_tag}"
-            description: "If set, this value will be added to the docker image tag as a prefix"
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
+      - string:
+          name: PUSH_IMAGE
+          default: "true"
+          description: "To enable/disable pushing the image to Dockerhub."
+      - string:
+          name: DOCKER_REPO_NAME
+          default: "opnfv/{dockerrepo}"
+          description: "Dockerhub repo to be pushed to."
+      - string:
+          name: DOCKER_DIR
+          default: "{dockerdir}"
+          description: "Directory containing files needed by the Dockerfile"
+      - string:
+          name: COMMIT_ID
+          default: ""
+          description: "commit id to make a snapshot docker image"
+      - string:
+          name: RELEASE_VERSION
+          default: ""
+          description: "Release version, e.g. 1.0, 2.0, 3.0"
+      - string:
+          name: DOCKERFILE
+          default: "{dockerfile}"
+          description: "Dockerfile to use for creating the image."
+      - string:
+          name: ARCH_TAG
+          default: "{arch_tag}"
+          description: "If set, this value will be added to the docker image tag as a prefix"
 
     properties:
-        - throttle:
-            max-per-node: 1
-            option: 'project'
+      - throttle:
+          max-per-node: 1
+          option: 'project'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders: &builders
-        - shell:
-            !include-raw-escape: ./opnfv-docker.sh
+      - shell:
+          !include-raw-escape: ./opnfv-docker.sh
 
     triggers:
-        - pollscm:
-            cron: "*/30 * * * *"
+      - pollscm:
+          cron: "*/30 * * * *"
 
     publishers:
-        - email:
-            recipients: '{receivers}'
-        - email-jenkins-admins-on-failure
+      - email:
+          recipients: '{receivers}'
+      - email-jenkins-admins-on-failure
 
 - job-template:
     name: '{project}-docker-build-push-monitor-{stream}'
     disabled: '{obj:disabled}'
     parameters: *parameters
+
     scm:
-        - git-scm
+      - git-scm
+
     builders: *builders
 
     # trigger only matching the file name
     triggers:
-        - gerrit:
-            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}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'docker/**'
-
+      - gerrit:
+          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}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'docker/**'
diff --git a/jjb/releng/opnfv-docs.yml b/jjb/releng/opnfv-docs.yml
index f4b25017e..afe8523f2 100644
--- a/jjb/releng/opnfv-docs.yml
+++ b/jjb/releng/opnfv-docs.yml
@@ -1,3 +1,4 @@
+---
 ########################
 # Job configuration for opnfv-docs
 ########################
@@ -8,20 +9,20 @@
     project: opnfv-docs
 
     jobs:
-        - 'opnfv-docs-verify-{stream}'
-        - 'opnfv-docs-merge-{stream}'
+      - 'opnfv-docs-verify-{stream}'
+      - 'opnfv-docs-merge-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            doc-version: ''
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            doc-version: '3.0'
-            gs-pathname: '/{stream}/{doc-version}'
-            disabled: true
+      - master:
+          branch: '{stream}'
+          doc-version: ''
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          doc-version: '3.0'
+          gs-pathname: '/{stream}/{doc-version}'
+          disabled: true
 
 ########################
 # job templates
@@ -33,40 +34,40 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: $GERRIT_PROJECT
-            branch: '{branch}'
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '*'
-                  branches:
-                      - branch-compare-type: 'ANT'
-                        branch-pattern: '**/{branch}'
-                  file-paths:
-                      - compare-type: ANT
-                        pattern: docs/**
-                      - compare-type: ANT
-                        pattern: yardstick/**
+      - 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: '*'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: docs/**
+                - compare-type: ANT
+                  pattern: yardstick/**
 
     builders:
-        - upload-review-docs
+      - upload-review-docs
 
 - job-template:
     name: 'opnfv-docs-merge-{stream}'
@@ -74,41 +75,41 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: $GERRIT_PROJECT
-            branch: '{branch}'
-        - string:
-            name: GS_URL
-            default: '$GS_BASE{gs-pathname}'
-            description: "Directory where the build artifact will be located upon the completion of the build."
-        - string:
-            name: GERRIT_REFSPEC
-            default: 'refs/heads/{branch}'
-            description: "JJB configured GERRIT_REFSPEC parameter"
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - string:
+          name: GS_URL
+          default: '$GS_BASE{gs-pathname}'
+          description: "Directory where the build artifact will be located upon the completion of the build."
+      - string:
+          name: GERRIT_REFSPEC
+          default: 'refs/heads/{branch}'
+          description: "JJB configured GERRIT_REFSPEC parameter"
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-                - comment-added-contains-event:
-                    comment-contains-value: 'rebuild docs'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '*'
-                  branches:
-                      - branch-compare-type: 'ANT'
-                        branch-pattern: '**/{branch}'
-                  file-paths:
-                      - compare-type: ANT
-                        pattern: docs/**
-                      - compare-type: ANT
-                        pattern: yardstick/**
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - change-merged-event
+            - comment-added-contains-event:
+                comment-contains-value: 'remerge'
+            - comment-added-contains-event:
+                comment-contains-value: 'rebuild docs'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '*'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: docs/**
+                - compare-type: ANT
+                  pattern: yardstick/**
 
     builders:
-        - upload-merged-docs
+      - upload-merged-docs
diff --git a/jjb/releng/opnfv-lint.yml b/jjb/releng/opnfv-lint.yml
index d253da027..b51779f12 100644
--- a/jjb/releng/opnfv-lint.yml
+++ b/jjb/releng/opnfv-lint.yml
@@ -1,3 +1,4 @@
+---
 ########################
 # Job configuration for opnfv-lint
 ########################
@@ -8,18 +9,18 @@
     project: opnfv-lint
 
     jobs:
-        - 'opnfv-lint-verify-{stream}'
-        - 'opnfv-yamllint-verify-{stream}'
+      - 'opnfv-lint-verify-{stream}'
+      - 'opnfv-yamllint-verify-{stream}'
 
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 ########################
 # job templates
@@ -31,39 +32,39 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: $GERRIT_PROJECT
-            branch: '{branch}'
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: 'functest|sdnvpn|qtip|daisy|sfc|escalator|releng'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: '**/*.py'
+      - 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: 'REG_EXP'
+              project-pattern: 'functest|sdnvpn|qtip|daisy|sfc|escalator|releng'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: '**/*.py'
 
     builders:
-        - lint-python-code
-        - report-lint-result-to-gerrit
+      - lint-python-code
+      - report-lint-result-to-gerrit
 
 - job-template:
     name: 'opnfv-yamllint-verify-{stream}'
@@ -73,45 +74,45 @@
     concurrent: true
 
     parameters:
-        - project-parameter:
-            project: $GERRIT_PROJECT
-            branch: '{branch}'
-        - node:
-            name: SLAVE_NAME
-            description: Slaves to execute yamllint
-            default-slaves:
-                - lf-build1
-            allowed-multiselect: true
-            ignore-offline-nodes: true
+      - project-parameter:
+          project: $GERRIT_PROJECT
+          branch: '{branch}'
+      - node:
+          name: SLAVE_NAME
+          description: Slaves to execute yamllint
+          default-slaves:
+            - lf-build1
+          allowed-multiselect: true
+          ignore-offline-nodes: true
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'REG_EXP'
-                project-pattern: 'octopus|releng-anteater|pharos'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: '**/*.yml'
-                  - compare-type: ANT
-                    pattern: '**/*.yaml'
+      - 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: 'REG_EXP'
+              project-pattern: 'octopus|releng-anteater|pharos'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: '**/*.yml'
+                - compare-type: ANT
+                  pattern: '**/*.yaml'
 
     builders:
-        - lint-yaml-code
-        - report-lint-result-to-gerrit
+      - lint-yaml-code
+      - report-lint-result-to-gerrit
diff --git a/jjb/releng/opnfv-utils.yml b/jjb/releng/opnfv-utils.yml
index 721b5dede..80cd08f4e 100644
--- a/jjb/releng/opnfv-utils.yml
+++ b/jjb/releng/opnfv-utils.yml
@@ -1,11 +1,12 @@
+---
 - project:
 
     name: opnfv-utils
 
     jobs:
-        - 'prune-docker-images'
-        - 'archive-repositories'
-        - 'check-status-of-slaves'
+      - 'prune-docker-images'
+      - 'archive-repositories'
+      - 'check-status-of-slaves'
 
 ########################
 # job templates
@@ -18,28 +19,28 @@
     concurrent: true
 
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: Slaves to prune docker images
-            default-slaves:
-                - arm-build2
-                - ericsson-build4
-                - ericsson-build5
-                - lf-build2
-            allowed-multiselect: true
-            ignore-offline-nodes: true
+      - node:
+          name: SLAVE_NAME
+          description: Slaves to prune docker images
+          default-slaves:
+            - arm-build2
+            - ericsson-build4
+            - ericsson-build5
+            - lf-build2
+          allowed-multiselect: true
+          ignore-offline-nodes: true
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - shell: |
-            #!/bin/bash
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - shell: |
+          #!/bin/bash
 
-            (docker ps -q; docker ps -aq) | sort | uniq -u | xargs --no-run-if-empty docker rm
-            docker images -f dangling=true -q | xargs --no-run-if-empty docker rmi
+          (docker ps -q; docker ps -aq) | sort | uniq -u | xargs --no-run-if-empty docker rm
+          docker images -f dangling=true -q | xargs --no-run-if-empty docker rmi
 
     triggers:
-        - timed: '@midnight'
+      - timed: '@midnight'
 
 - job-template:
     name: 'archive-repositories'
@@ -49,20 +50,20 @@
     concurrent: true
 
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: Where to create the archive
-            default-slaves:
-                - master
-            allowed-multiselect: false
-            ignore-offline-nodes: true
+      - node:
+          name: SLAVE_NAME
+          description: Where to create the archive
+          default-slaves:
+            - master
+          allowed-multiselect: false
+          ignore-offline-nodes: true
 
     triggers:
-        - timed: '@monthly'
+      - timed: '@monthly'
 
     builders:
-        - shell:
-            !include-raw-escape: opnfv-repo-archiver.sh
+      - shell:
+          !include-raw-escape: opnfv-repo-archiver.sh
 
 - job-template:
     name: 'check-status-of-slaves'
@@ -72,18 +73,18 @@
     concurrent: true
 
     parameters:
-        - node:
-            name: SLAVE_NAME
-            description: We don't want workspace wiped. so I just threw the script on the master
-            default-slaves:
-                - master
-            allowed-multiselect: false
-            ignore-offline-nodes: true
+      - node:
+          name: SLAVE_NAME
+          description: We don't want workspace wiped. so I just threw the script on the master
+          default-slaves:
+            - master
+          allowed-multiselect: false
+          ignore-offline-nodes: true
 
     triggers:
-        - timed: '@midnight'
+      - timed: '@midnight'
 
     builders:
-        - shell: |
-            cd /opt/jenkins-ci/slavemonitor
-            bash slave-monitor-0.1.sh | sort
+      - shell: |
+          cd /opt/jenkins-ci/slavemonitor
+          bash slave-monitor-0.1.sh | sort
diff --git a/jjb/releng/releng-ci-jobs.yml b/jjb/releng/releng-ci-jobs.yml
index fd58ef2b8..d4f39708e 100644
--- a/jjb/releng/releng-ci-jobs.yml
+++ b/jjb/releng/releng-ci-jobs.yml
@@ -1,10 +1,11 @@
+---
 - project:
     name: releng-builder-jobs
     jobs:
-        - 'releng-verify-jjb'
-        - 'releng-merge-jjb'
-        - 'releng-comment-jjb'
-        - 'releng-generate-artifacts-api'
+      - 'releng-verify-jjb'
+      - 'releng-merge-jjb'
+      - 'releng-comment-jjb'
+      - 'releng-generate-artifacts-api'
 
     project: 'releng'
 
@@ -12,69 +13,71 @@
     name: releng-verify-jjb
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: 'master'
+      - project-parameter:
+          project: '{project}'
+          branch: 'master'
+
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: jjb-templates/**
-                    - compare-type: ANT
-                      pattern: utils/**
+      - 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: 'releng'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/master'
+              file-paths:
+                - compare-type: ANT
+                  pattern: jjb/**
+                - compare-type: ANT
+                  pattern: jjb-templates/**
+                - compare-type: ANT
+                  pattern: utils/**
 
 
     builders:
-        - shell:
-            !include-raw: verify-releng.sh
+      - shell:
+          !include-raw: verify-releng.sh
 
     publishers:
-        - archive-artifacts:
-            artifacts: 'job_output/*'
-        - email-jenkins-admins-on-failure
+      - archive-artifacts:
+          artifacts: 'job_output/*'
+      - email-jenkins-admins-on-failure
 
 - job-template:
     name: releng-comment-jjb
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: 'master'
+      - project-parameter:
+          project: '{project}'
+          branch: 'master'
+
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - experimental:
-            project: '{project}'
-            branch: 'master'
-            files: 'jjb/**'
+      - experimental:
+          project: '{project}'
+          branch: 'master'
+          files: 'jjb/**'
 
     builders:
-        - shell:
-            !include-raw-escape: generate-job-list.sh
-        - report-build-result-to-gerrit
+      - shell:
+          !include-raw-escape: generate-job-list.sh
+      - report-build-result-to-gerrit
 
 - job-template:
     name: 'releng-merge-jjb'
@@ -84,38 +87,38 @@
     # This job's purpose is to update all the JJB
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: 'master'
+      - project-parameter:
+          project: '{project}'
+          branch: 'master'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - change-merged-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'remerge'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: 'releng'
-                branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**/master'
-                file-paths:
-                    - compare-type: ANT
-                      pattern: jjb/**
-                    - compare-type: ANT
-                      pattern: utils/**
+      - 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: 'releng'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/master'
+              file-paths:
+                - compare-type: ANT
+                  pattern: jjb/**
+                - compare-type: ANT
+                  pattern: utils/**
 
     builders:
-        - shell: |
-                source /opt/virtualenv/jenkins-job-builder/bin/activate
-                cd /opt/jenkins-ci/releng
-                git pull
-                jenkins-jobs update -r --delete-old jjb/
+      - shell: |
+              source /opt/virtualenv/jenkins-job-builder/bin/activate
+              cd /opt/jenkins-ci/releng
+              git pull
+              jenkins-jobs update -r --delete-old jjb/
 
 - job-template:
     name: 'releng-generate-artifacts-api'
@@ -123,15 +126,15 @@
     # Generate and upload the JSON file to used for artifacts site
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: 'master'
+      - project-parameter:
+          project: '{project}'
+          branch: 'master'
 
     scm:
-        - git-scm
+      - git-scm
 
     triggers:
-        - timed: '@hourly'
+      - timed: '@hourly'
 
     builders:
-        - build-and-upload-artifacts-json-api
+      - build-and-upload-artifacts-json-api