Fix Yamllint Violations for jjb/joid

JIRA: RELENG-254

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

diff --git a/jjb/joid/joid-daily-jobs.yml b/jjb/joid/joid-daily-jobs.yml
index 1c7b8cd..ac04962 100644 (file)
--- a/jjb/joid/joid-daily-jobs.yml
+++ b/jjb/joid/joid-daily-jobs.yml
@@ -1,3 +1,4 @@
+---
 ########################
 # Job configuration for joid
 ########################
@@ -9,73 +10,73 @@
 
     installer: '{name}'
 
-#--------------------------------
-# BRANCH ANCHORS
-#--------------------------------
+    # -------------------------------
+    # BRANCH ANCHORS
+    # -------------------------------
     master: &master
-        stream: master
-        branch: '{stream}'
-        disabled: false
-        gs-pathname: ''
-#--------------------------------
-# POD, INSTALLER, AND BRANCH MAPPING
-#--------------------------------
-#        CI PODs
-#--------------------------------
+      stream: master
+      branch: '{stream}'
+      disabled: false
+      gs-pathname: ''
+    # -------------------------------
+    # POD, INSTALLER, AND BRANCH MAPPING
+    # -------------------------------
+    #        CI PODs
+    # -------------------------------
     pod:
-        - baremetal:
-            slave-label: joid-baremetal
-            <<: *master
-        - virtual:
-            slave-label: joid-virtual
-            <<: *master
-#--------------------------------
-#        None-CI PODs
-#--------------------------------
-        - orange-pod1:
-            slave-label: orange-pod1
-            <<: *master
-        - cengn-pod1:
-            slave-label: cengn-pod1
-            <<: *master
-#--------------------------------
-# scenarios
-#--------------------------------
+      - baremetal:
+          slave-label: joid-baremetal
+          <<: *master
+      - virtual:
+          slave-label: joid-virtual
+          <<: *master
+      # -------------------------------
+      #        None-CI PODs
+      # -------------------------------
+      - orange-pod1:
+          slave-label: orange-pod1
+          <<: *master
+      - cengn-pod1:
+          slave-label: cengn-pod1
+          <<: *master
+    # -------------------------------
+    # scenarios
+    # -------------------------------
     scenario:
-        - 'os-nosdn-nofeature-noha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-nofeature-ha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-lxd-ha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-lxd-noha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-        - 'os-odl_l2-nofeature-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'os-onos-nofeature-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'os-odl_l2-nofeature-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'os-onos-nofeature-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'os-onos-sfc-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'os-ocl-nofeature-ha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'os-ocl-nofeature-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'k8-nosdn-nofeature-noha':
-            auto-trigger-name: 'daily-trigger-disabled'
-        - 'k8-nosdn-lb-noha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-        - 'k8-ovn-lb-noha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-        - 'os-nosdn-openbaton-ha':
-            auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-nofeature-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-nofeature-ha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-lxd-ha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-lxd-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'os-odl_l2-nofeature-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-onos-nofeature-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-odl_l2-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-onos-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-onos-sfc-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-ocl-nofeature-ha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'os-ocl-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'k8-nosdn-nofeature-noha':
+          auto-trigger-name: 'daily-trigger-disabled'
+      - 'k8-nosdn-lb-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'k8-ovn-lb-noha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
+      - 'os-nosdn-openbaton-ha':
+          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-        - 'joid-{scenario}-{pod}-daily-{stream}'
-        - 'joid-deploy-{pod}-daily-{stream}'
+      - 'joid-{scenario}-{pod}-daily-{stream}'
+      - 'joid-deploy-{pod}-daily-{stream}'
 
 ########################
 # job templates
@@ -88,85 +89,86 @@
     concurrent: false
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 4
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'joid-os-.*?-{pod}-daily-.*'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 4
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'joid-os-.*?-{pod}-daily-.*'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
 
     triggers:
-        - '{auto-trigger-name}'
+      - '{auto-trigger-name}'
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults':
-            installer: '{installer}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: '{scenario}'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults':
+          installer: '{installer}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: '{scenario}'
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - trigger-builds:
-            - project: 'joid-deploy-{pod}-daily-{stream}'
-              current-parameters: true
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              same-node: true
-              block: true
-        - trigger-builds:
-            - project: 'functest-joid-{pod}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        - trigger-builds:
-            - project: 'yardstick-joid-{pod}-daily-{stream}'
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO={scenario}
-              block: true
-              same-node: true
-              block-thresholds:
-                build-step-failure-threshold: 'never'
-                failure-threshold: 'never'
-                unstable-threshold: 'FAILURE'
-        # 1.dovetail only master by now, not sync with A/B/C branches
-        # 2.here the stream means the SUT stream, dovetail stream is defined in its own job
-        # 3.only debug testsuite here(includes basic testcase,
-        #   i.e. one tempest smoke ipv6, two vping from functest)
-        # 4.not used for release criteria or compliance,
-        #   only to debug the dovetail tool bugs with joid
-        #- trigger-builds:
-        #    - project: 'dovetail-joid-{pod}-proposed_tests-{stream}'
-        #      current-parameters: false
-        #      predefined-parameters:
-        #        DEPLOY_SCENARIO={scenario}
-        #      block: true
-        #      same-node: true
-        #      block-thresholds:
-        #        build-step-failure-threshold: 'never'
-        #        failure-threshold: 'never'
-        #        unstable-threshold: 'FAILURE'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - trigger-builds:
+          - project: 'joid-deploy-{pod}-daily-{stream}'
+            current-parameters: true
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            same-node: true
+            block: true
+      - trigger-builds:
+          - project: 'functest-joid-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'yardstick-joid-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters:
+              DEPLOY_SCENARIO={scenario}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+# 1.dovetail only master by now, not sync with A/B/C branches
+# 2.here the stream means the SUT stream, dovetail stream is defined in
+#   its own job
+# 3.only debug testsuite here(includes basic testcase,
+#   i.e. one tempest smoke ipv6, two vping from functest)
+# 4.not used for release criteria or compliance,
+#   only to debug the dovetail tool bugs with joid
+# - trigger-builds:
+#     - project: 'dovetail-joid-{pod}-proposed_tests-{stream}'
+#       current-parameters: false
+#       predefined-parameters:
+#         DEPLOY_SCENARIO={scenario}
+#       block: true
+#       same-node: true
+#       block-thresholds:
+#         build-step-failure-threshold: 'never'
+#         failure-threshold: 'never'
+#         unstable-threshold: 'FAILURE'
 
 - job-template:
     name: 'joid-deploy-{pod}-daily-{stream}'
@@ -176,58 +178,58 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 4
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'joid-deploy-{pod}-daily-.*'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 4
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'joid-deploy-{pod}-daily-.*'
+          block-level: 'NODE'
 
     wrappers:
-        - build-name:
-            name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-        - timeout:
-            timeout: 180
-            fail: true
+      - build-name:
+          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
+      - timeout:
+          timeout: 180
+          fail: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults':
-            installer: '{installer}'
-        - string:
-            name: DEPLOY_SCENARIO
-            default: 'os-odl_l2-nofeature-ha'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults':
+          installer: '{installer}'
+      - string:
+          name: DEPLOY_SCENARIO
+          default: 'os-odl_l2-nofeature-ha'
 
     scm:
-        - git-scm
+      - git-scm
 
     builders:
-        - description-setter:
-            description: "POD: $NODE_NAME"
-        - 'builder-macro'
+      - description-setter:
+          description: "POD: $NODE_NAME"
+      - 'builder-macro'
 ########################
 # builder macros
 ########################
 - builder:
     name: 'builder-macro'
     builders:
-        - shell: |
-            #!/bin/bash
-            echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER"
-            echo
-            echo "------ First Executing clean.sh ------"
-            cd $WORKSPACE/ci
-            ./clean.sh
-        - shell:
-            !include-raw: ./joid-deploy.sh
+      - shell: |
+          #!/bin/bash
+          echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER"
+          echo
+          echo "------ First Executing clean.sh ------"
+          cd $WORKSPACE/ci
+          ./clean.sh
+      - shell:
+          !include-raw: ./joid-deploy.sh
 
 ########################
 # trigger macros
@@ -236,187 +238,187 @@
 - trigger:
     name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '5 2 * * *'
+      - timed: '5 2 * * *'
 - trigger:
     name: 'joid-os-nosdn-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-nofeature-ha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-nofeature-ha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # os-odl_l2-nofeature-ha trigger - branch: master
 - trigger:
     name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '5 7 * * *'
+      - timed: '5 7 * * *'
 - trigger:
     name: 'joid-os-odl_l2-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-odl_l2-nofeature-ha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-odl_l2-nofeature-ha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # os-onos-nofeature-ha trigger - branch: master
 - trigger:
     name: 'joid-os-onos-nofeature-ha-baremetal-master-trigger'
     triggers:
-        - timed: '5 12 * * *'
+      - timed: '5 12 * * *'
 - trigger:
     name: 'joid-os-onos-nofeature-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-onos-nofeature-ha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-onos-nofeature-ha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # os-onos-sfc-ha trigger - branch: master
 - trigger:
     name: 'joid-os-onos-sfc-ha-baremetal-master-trigger'
     triggers:
-        - timed: '5 17 * * *'
+      - timed: '5 17 * * *'
 - trigger:
     name: 'joid-os-onos-sfc-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-onos-sfc-ha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-onos-sfc-ha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # os-nosdn-lxd-noha trigger - branch: master
 - trigger:
     name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
     triggers:
-        - timed: '5 22 * * *'
+      - timed: '5 22 * * *'
 - trigger:
     name: 'joid-os-nosdn-lxd-noha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-lxd-noha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-lxd-noha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # os-nosdn-lxd-ha trigger - branch: master
 - trigger:
     name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
     triggers:
-        - timed: '5 10 * * *'
+      - timed: '5 10 * * *'
 - trigger:
     name: 'joid-os-nosdn-lxd-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-lxd-ha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-lxd-ha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # os-nosdn-nofeature-noha trigger - branch: master
 - trigger:
     name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
     triggers:
-        - timed: '5 4 * * *'
+      - timed: '5 4 * * *'
 - trigger:
     name: 'joid-os-nosdn-nofeature-noha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-nofeature-noha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-nofeature-noha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # k8-nosdn-nofeature-noha trigger - branch: master
 - trigger:
     name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
     triggers:
-        - timed: '5 15 * * *'
+      - timed: '5 15 * * *'
 - trigger:
     name: 'joid-k8-nosdn-nofeature-noha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-k8-nosdn-nofeature-noha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-k8-nosdn-nofeature-noha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # k8-nosdn-lb-noha trigger - branch: master
 - trigger:
     name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
     triggers:
-        - timed: '5 20 * * *'
+      - timed: '5 20 * * *'
 - trigger:
     name: 'joid-k8-nosdn-lb-noha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-k8-nosdn-lb-noha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-k8-nosdn-lb-noha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 # k8-ovn-lb-noha trigger - branch: master
 - trigger:
     name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
     triggers:
-        - timed: '5 17 * * *'
+      - timed: '5 17 * * *'
 - trigger:
     name: 'joid-k8-ovn-lb-noha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-k8-ovn-lb-noha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-k8-ovn-lb-noha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 
 # os-nosdn-openbaton-ha trigger - branch: master
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
     triggers:
-        - timed: '5 25 * * *'
+      - timed: '5 25 * * *'
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-virtual-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-orange-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''
 - trigger:
     name: 'joid-os-nosdn-openbaton-ha-cengn-pod1-master-trigger'
     triggers:
-        - timed: ''
+      - timed: ''

diff --git a/jjb/joid/joid-verify-jobs.yml b/jjb/joid/joid-verify-jobs.yml
index 03fab55..3b30cb6 100644 (file)
--- a/jjb/joid/joid-verify-jobs.yml
+++ b/jjb/joid/joid-verify-jobs.yml
@@ -1,37 +1,38 @@
+---
 - project:
     name: 'joid-verify-jobs'
 
     project: 'joid'
 
     installer: 'joid'
-#####################################
-# branch definitions
-#####################################
+    #####################################
+    # branch definitions
+    #####################################
     stream:
-        - master:
-            branch: '{stream}'
-            gs-pathname: ''
-            disabled: false
-        - danube:
-            branch: 'stable/{stream}'
-            gs-pathname: '/{stream}'
-            disabled: false
-#####################################
-# patch verification phases
-#####################################
+      - master:
+          branch: '{stream}'
+          gs-pathname: ''
+          disabled: false
+      - danube:
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+    #####################################
+    # patch verification phases
+    #####################################
     phase:
-        - 'basic':
-            slave-label: 'opnfv-build-ubuntu'
-        - 'deploy-virtual':
-            slave-label: 'joid-virtual'
-        - 'smoke-test':
-            slave-label: 'joid-virtual'
-#####################################
-# jobs
-#####################################
+      - 'basic':
+          slave-label: 'opnfv-build-ubuntu'
+      - 'deploy-virtual':
+          slave-label: 'joid-virtual'
+      - 'smoke-test':
+          slave-label: 'joid-virtual'
+    #####################################
+    # jobs
+    #####################################
     jobs:
-        - 'joid-verify-{stream}'
-        - 'joid-verify-{phase}-{stream}'
+      - 'joid-verify-{stream}'
+      - 'joid-verify-{phase}-{stream}'
 #####################################
 # job templates
 #####################################
@@ -45,103 +46,103 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 4
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'joid-verify-master'
-                - 'joid-verify-danube'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 4
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'joid-verify-master'
+            - 'joid-verify-danube'
+          block-level: 'NODE'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     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:
-                - 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'
-            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'
+          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'
+          readable-message: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - 'joid-virtual-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - 'joid-virtual-defaults'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - multijob:
-            name: basic
-            condition: SUCCESSFUL
-            projects:
-                - name: 'joid-verify-basic-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    BRANCH=$BRANCH
-                    GERRIT_REFSPEC=$GERRIT_REFSPEC
-                    GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                    GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                  kill-phase-on: FAILURE
-                  abort-all-job: true
-        - multijob:
-            name: deploy-virtual
-            condition: SUCCESSFUL
-            projects:
-                - name: 'joid-verify-deploy-virtual-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    BRANCH=$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: smoke-test
-            condition: SUCCESSFUL
-            projects:
-                - name: 'joid-verify-smoke-test-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    BRANCH=$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
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - multijob:
+          name: basic
+          condition: SUCCESSFUL
+          projects:
+            - name: 'joid-verify-basic-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BRANCH=$BRANCH
+                GERRIT_REFSPEC=$GERRIT_REFSPEC
+                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+              kill-phase-on: FAILURE
+              abort-all-job: true
+      - multijob:
+          name: deploy-virtual
+          condition: SUCCESSFUL
+          projects:
+            - name: 'joid-verify-deploy-virtual-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BRANCH=$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: smoke-test
+          condition: SUCCESSFUL
+          projects:
+            - name: 'joid-verify-smoke-test-{stream}'
+              current-parameters: false
+              predefined-parameters: |
+                BRANCH=$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
 
 - job-template:
     name: 'joid-verify-{phase}-{stream}'
@@ -151,62 +152,62 @@
     concurrent: true
 
     properties:
-        - logrotate-default
-        - throttle:
-            enabled: true
-            max-total: 4
-            max-per-node: 1
-            option: 'project'
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-                - 'joid-verify-deploy-.*'
-                - 'joid-verify-test-.*'
-            block-level: 'NODE'
+      - logrotate-default
+      - throttle:
+          enabled: true
+          max-total: 4
+          max-per-node: 1
+          option: 'project'
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'joid-verify-deploy-.*'
+            - 'joid-verify-test-.*'
+          block-level: 'NODE'
 
     scm:
-        - git-scm-gerrit
+      - git-scm-gerrit
 
     wrappers:
-        - ssh-agent-wrapper
-        - timeout:
-            timeout: 360
-            fail: true
+      - ssh-agent-wrapper
+      - timeout:
+          timeout: 360
+          fail: true
 
     parameters:
-        - project-parameter:
-            project: '{project}'
-            branch: '{branch}'
-        - '{installer}-defaults'
-        - '{slave-label}-defaults'
+      - project-parameter:
+          project: '{project}'
+          branch: '{branch}'
+      - '{installer}-defaults'
+      - '{slave-label}-defaults'
 
     builders:
-        - description-setter:
-            description: "Built on $NODE_NAME"
-        - '{project}-verify-{phase}-macro'
+      - description-setter:
+          description: "Built on $NODE_NAME"
+      - '{project}-verify-{phase}-macro'
 #####################################
 # builder macros
 #####################################
 - builder:
     name: 'joid-verify-basic-macro'
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            echo "Not activated!"
+          echo "Not activated!"
 
 - builder:
     name: 'joid-verify-deploy-virtual-macro'
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            echo "Not activated!"
+          echo "Not activated!"
 
 - builder:
     name: 'joid-verify-smoke-test-macro'
     builders:
-        - shell: |
-            #!/bin/bash
+      - shell: |
+          #!/bin/bash
 
-            echo "Not activated!"
+          echo "Not activated!"