Merge "Fix Yamllint Violations for jjb/qtip"

3 files changed, 220 insertions, 212 deletions

diff --git a/jjb/qtip/qtip-experimental-jobs.yml b/jjb/qtip/qtip-experimental-jobs.yml
index 05445d898..23e441a1c 100644
--- a/jjb/qtip/qtip-experimental-jobs.yml
+++ b/jjb/qtip/qtip-experimental-jobs.yml
@@ -1,3 +1,4 @@
+---
 ###########################################
 # Experimental jobs for development purpose
 ###########################################
@@ -6,12 +7,12 @@
     name: qtip-experimental-jobs
     project: qtip
     jobs:
-        - 'qtip-experimental-{stream}'
+      - 'qtip-experimental-{stream}'
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
 
 ################################
 ## job templates
@@ -23,22 +24,22 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        # Pin the tests on zte-pod4 with apex deployment
-        - apex-defaults
-        - zte-pod4-defaults
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      # Pin the tests on zte-pod4 with apex deployment
+      - apex-defaults
+      - zte-pod4-defaults
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - experimental:
-            project: '{project}'
-            branch: '{branch}'
-            files: '**'
+      - experimental:
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
 
     builders:
-        - shell: |
-             #!/bin/bash
-                source tests/ci/experimental.sh
+      - shell: |
+           #!/bin/bash
+              source tests/ci/experimental.sh
diff --git a/jjb/qtip/qtip-validate-jobs.yml b/jjb/qtip/qtip-validate-jobs.yml
index e64173ca7..b63782b8c 100644
--- a/jjb/qtip/qtip-validate-jobs.yml
+++ b/jjb/qtip/qtip-validate-jobs.yml
@@ -1,3 +1,4 @@
+---
 #######################
 # validate after MERGE
 #######################
@@ -5,33 +6,33 @@
     name: qtip
     project: qtip
 
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        gs-pathname: ''
-        docker-tag: latest
+      stream: master
+      branch: '{stream}'
+      gs-pathname: ''
+      docker-tag: latest
 
-#--------------------------------
-# JOB VARIABLES
-#--------------------------------
+    # -------------------------------
+    # JOB VARIABLES
+    # -------------------------------
     qpi:
-        - compute:
-            installer: apex
-            pod: zte-pod4
-            <<: *master
-        - storage:
-            installer: apex
-            pod: zte-pod4
-            <<: *master
+      - compute:
+          installer: apex
+          pod: zte-pod4
+          <<: *master
+      - storage:
+          installer: apex
+          pod: zte-pod4
+          <<: *master
 
-#--------------------------------
-# JOB LIST
-#--------------------------------
+    # -------------------------------
+    # JOB LIST
+    # -------------------------------
     jobs:
-        - 'qtip-{qpi}-{installer}-{stream}'
+      - 'qtip-{qpi}-{installer}-{stream}'
 
 ################################
 # job templates
@@ -40,66 +41,69 @@
     name: 'qtip-{qpi}-{installer}-{stream}'
     disabled: false
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{installer}-defaults'
-        - '{pod}-defaults'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: generic
-        - string:
-            name: DOCKER_TAG
-            default: '{docker-tag}'
-            description: 'Tag to pull docker image'
-        - string:
-            name: CI_DEBUG
-            default: 'false'
-            description: "Show debug output information"
-        - string:
-            name: TEST_SUITE
-            default: '{qpi}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{pod}-defaults'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: generic
+      - string:
+          name: DOCKER_TAG
+          default: '{docker-tag}'
+          description: 'Tag to pull docker image'
+      - string:
+          name: CI_DEBUG
+          default: 'false'
+          description: "Show debug output information"
+      - string:
+          name: TEST_SUITE
+          default: '{qpi}'
     scm:
-        - git-scm
+      - git-scm
+
     triggers:
-        - 'qtip-daily'
+      - 'qtip-daily'
+
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - shell: |
-            #!/bin/bash
-            source tests/ci/periodic.sh
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - shell: |
+          #!/bin/bash
+          source tests/ci/periodic.sh
+
     publishers:
-        - qtip-common-publishers
-        - email-jenkins-admins-on-failure
+      - qtip-common-publishers
+      - email-jenkins-admins-on-failure
 
 ################
 # MARCOS
 ################
 
-#---------
+# --------
 # builder
-#---------
+# --------
 
-#-----------
+# ----------
 # parameter
-#-----------
+# ----------
 
-#-----------
+# ----------
 # publisher
-#-----------
+# ----------
 
 - publisher:
     name: qtip-common-publishers
     publishers:
-        - email:
-            recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn
+      - email:
+          recipients: wu.zhihui1@zte.com.cn, zhang.yujunz@zte.com.cn
 
-#---------
+# --------
 # trigger
-#---------
+# --------
 
 - trigger:
     name: 'qtip-daily'
     triggers:
-        - timed: '0 15 * * *'
+      - timed: '0 15 * * *'
diff --git a/jjb/qtip/qtip-verify-jobs.yml b/jjb/qtip/qtip-verify-jobs.yml
index a273c858f..26a97066f 100644
--- a/jjb/qtip/qtip-verify-jobs.yml
+++ b/jjb/qtip/qtip-verify-jobs.yml
@@ -1,3 +1,4 @@
+---
 ######################
 # verify before MERGE
 ######################
@@ -6,18 +7,18 @@
     name: qtip-verify-jobs
     project: qtip
     jobs:
-        - 'qtip-verify-{stream}'
-        - 'qtip-review-notebook-{stream}'
-        - 'qtip-merge-{stream}'
+      - 'qtip-verify-{stream}'
+      - 'qtip-review-notebook-{stream}'
+      - 'qtip-merge-{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
@@ -28,43 +29,43 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                disable-strict-forbidden-file-verification: 'true'
-                forbidden-file-paths:
-                  - compare-type: ANT
-                    pattern: 'docs/**|.gitignore'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              forbidden-file-paths:
+                - compare-type: ANT
+                  pattern: 'docs/**|.gitignore'
 
     builders:
-        - qtip-unit-tests-and-docs-build
+      - qtip-unit-tests-and-docs-build
     publishers:
-        - publish-coverage
-        - email-jenkins-admins-on-failure
+      - publish-coverage
+      - email-jenkins-admins-on-failure
 
 # upload juypter notebook to artifacts for review
 - job-template:
@@ -73,40 +74,41 @@
     disabled: '{obj:disabled}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'opnfv-build-ubuntu-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'opnfv-build-ubuntu-defaults'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     triggers:
-        - gerrit:
-            server-name: 'gerrit.opnfv.org'
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: 'false'
-                    exclude-trivial-rebase: 'false'
-                    exclude-no-code-change: 'false'
-                - draft-published-event
-                - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-                disable-strict-forbidden-file-verification: 'true'
-                file-paths:
-                  - compare-type: ANT
-                    pattern: 'examples/**'
+      - gerrit:
+          server-name: 'gerrit.opnfv.org'
+          trigger-on:
+            - patchset-created-event:
+                exclude-drafts: 'false'
+                exclude-trivial-rebase: 'false'
+                exclude-no-code-change: 'false'
+            - draft-published-event
+            - comment-added-contains-event:
+                comment-contains-value: 'recheck'
+            - comment-added-contains-event:
+                comment-contains-value: 'reverify'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              disable-strict-forbidden-file-verification: 'true'
+              file-paths:
+                - compare-type: ANT
+                  pattern: 'examples/**'
+
     builders:
-        - upload-under-review-notebooks-to-opnfv-artifacts
-        - report-build-result-to-gerrit
+      - upload-under-review-notebooks-to-opnfv-artifacts
+      - report-build-result-to-gerrit
 
 - job-template:
     name: 'qtip-merge-{stream}'
@@ -114,40 +116,40 @@
     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'
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: '*'
-                  branches:
-                      - branch-compare-type: 'ANT'
-                        branch-pattern: '**/{branch}'
-                  file-paths:
-                      - compare-type: ANT
-                        pattern: examples/**
+      - 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: '*'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+              file-paths:
+                - compare-type: ANT
+                  pattern: examples/**
 
     builders:
-        - remove-old-docs-from-opnfv-artifacts
+      - remove-old-docs-from-opnfv-artifacts
 
 ################################
 ## job builders
@@ -155,42 +157,43 @@
 - builder:
     name: qtip-unit-tests-and-docs-build
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
-            set -o xtrace
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+          set -o xtrace
 
-            tox
+          tox
 
-# modified from upload-under-review-docs-to-opnfv-artifacts in global/releng-macro.yml
+# modified from upload-under-review-docs-to-opnfv-artifacts
+# in global/releng-macro.yml
 - builder:
     name: upload-under-review-notebooks-to-opnfv-artifacts
     builders:
-        - shell: |
-            #!/bin/bash
-            set -o errexit
-            set -o pipefail
-            set -o xtrace
-            export PATH=$PATH:/usr/local/bin/
-
-            [[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
-            [[ -d examples ]] || exit 0
-
-            echo
-            echo "###########################"
-            echo "UPLOADING DOCS UNDER REVIEW"
-            echo "###########################"
-            echo
-
-            gs_base="artifacts.opnfv.org/$PROJECT/review"
-            gs_path="$gs_base/$GERRIT_CHANGE_NUMBER"
-            local_path="upload/$GERRIT_CHANGE_NUMBER"
-
-            mkdir -p upload
-            cp -r examples "$local_path"
-            gsutil -m cp -r "$local_path" "gs://$gs_base/"
-
-            echo "Document link(s):" >> gerrit_comment.txt
-            find "$local_path" | grep -e 'ipynb$' | \
-                sed -e "s|^$local_path|    https://nbviewer.jupyter.org/url/$gs_path|" >> gerrit_comment.txt
+      - shell: |
+          #!/bin/bash
+          set -o errexit
+          set -o pipefail
+          set -o xtrace
+          export PATH=$PATH:/usr/local/bin/
+
+          [[ $GERRIT_CHANGE_NUMBER =~ .+ ]]
+          [[ -d examples ]] || exit 0
+
+          echo
+          echo "###########################"
+          echo "UPLOADING DOCS UNDER REVIEW"
+          echo "###########################"
+          echo
+
+          gs_base="artifacts.opnfv.org/$PROJECT/review"
+          gs_path="$gs_base/$GERRIT_CHANGE_NUMBER"
+          local_path="upload/$GERRIT_CHANGE_NUMBER"
+
+          mkdir -p upload
+          cp -r examples "$local_path"
+          gsutil -m cp -r "$local_path" "gs://$gs_base/"
+
+          echo "Document link(s):" >> gerrit_comment.txt
+          find "$local_path" | grep -e 'ipynb$' | \
+              sed -e "s|^$local_path|    https://nbviewer.jupyter.org/url/$gs_path|" >> gerrit_comment.txt