Fix yamlint error

- Focus on indentation error
- Fix broken links in READMD

Change-Id: I37cca10f8d40f89b2b062c2e572772034ddcd09c
diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index bf3d8c2..cca01c2 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -11,48 +11,48 @@
     jobs:
       # onlab pod1 build
       - 'build_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         helmRepoUrl: 'https://charts.opencord.org'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          helmRepoUrl: 'https://charts.opencord.org'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+          oltDebVersion: 'openolt-master.deb'
 
       # onlab pod1 build - cord6.1(voltha 1.6) - seba1.0
       - 'build_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1-voltha16'
-         profile: 'att-workflow'
-         branch: 'cord-6.1'
-         test-repo: 'cord-tester'
-         helmRepoUrl: 'https://charts.opencord.org'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-         oltDebVersion: 'openolt-master-voltha16.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1-voltha16'
+          profile: 'att-workflow'
+          branch: 'cord-6.1'
+          test-repo: 'cord-tester'
+          helmRepoUrl: 'https://charts.opencord.org'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+          oltDebVersion: 'openolt-master-voltha16.deb'
 
       # flex pod1 test job - using voltha-master branch
       - 'build_pod_test':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1-qa'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1-qa'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # onlab pod2 build
       - 'build_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod2'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         helmRepoUrl: 'https://charts.opencord.org'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod2'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          helmRepoUrl: 'https://charts.opencord.org'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+          oltDebVersion: 'openolt-master.deb'
 
       # flex OCP pod with olt/onu : using voltha latest(master)
-      #- 'build_pod_timer':
+      # - 'build_pod_timer':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord-voltha-master'
       #   profile: 'att-workflow'
@@ -64,7 +64,7 @@
       #   time: '6'
 
       # flex OCP pod with olt/onu - seba-1.0/cord-6.1 release
-      #- 'build_pod_timer':
+      # - 'build_pod_timer':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord-voltha16'
       #   profile: 'att-workflow'
@@ -77,18 +77,18 @@
 
       # flex OCP test job - using voltha-master branch
       - 'build_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord-voltha-master'
-         profile: 'att-workflow'
-         branch: 'master'
-         test-repo: 'cord-tester'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-voltha-master'
+          profile: 'att-workflow'
+          branch: 'master'
+          test-repo: 'cord-tester'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # flex ocp pod test job - seba-1.0/cord-6.1 release
       - 'build_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord-voltha16'
-         profile: 'att-workflow'
-         branch: 'cord-6.1'
-         test-repo: 'cord-tester'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord-voltha16'
+          profile: 'att-workflow'
+          branch: 'cord-6.1'
+          test-repo: 'cord-tester'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
diff --git a/jjb/cord-test/mcord.yaml b/jjb/cord-test/mcord.yaml
index 5fd830a..917d927 100644
--- a/jjb/cord-test/mcord.yaml
+++ b/jjb/cord-test/mcord.yaml
@@ -11,23 +11,23 @@
     jobs:
       # onlab mcord-pod1 build
       - 'build_mcord_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onf-mcord-pod1'
-         profile: 'mcord'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-mcord-local-build'
+          testvm: 'onf-build'
+          config-pod: 'onf-mcord-pod1'
+          profile: 'mcord'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-mcord-local-build'
 
       - 'build_mcord_pod_manual':
-         testvm: 'onf-build'
-         config-pod: 'onf-mcord-pod2'
-         profile: 'mcord'
-         branch: 'master'
-         configurePod: false
-         Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
+          testvm: 'onf-build'
+          config-pod: 'onf-mcord-pod2'
+          profile: 'mcord'
+          branch: 'master'
+          configurePod: false
+          Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
 
       - 'build_mcord_pod_manual':
-         testvm: 'mcord-dt'
-         config-pod: 'mcord-barcellona-remote-dt'
-         profile: 'mcord'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
+          testvm: 'mcord-dt'
+          config-pod: 'mcord-barcellona-remote-dt'
+          profile: 'mcord'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-mcord-remote-build'
diff --git a/jjb/cord-test/nightly-build-pipeline.yaml b/jjb/cord-test/nightly-build-pipeline.yaml
index fda3ee1..3eb0d5f 100644
--- a/jjb/cord-test/nightly-build-pipeline.yaml
+++ b/jjb/cord-test/nightly-build-pipeline.yaml
@@ -28,63 +28,63 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: profile
-         default: '{profile}'
-         description: 'Profile in which this job installs'
+          name: profile
+          default: '{profile}'
+          description: 'Profile in which this job installs'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: installMonitoringAndLogging
@@ -97,9 +97,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -117,9 +117,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/{test-repo}'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/{test-repo}'
+            branches:
+              - '{branch}'
 
 - job-template:
     name: 'build_{profile}_{config-pod}_{branch}'
@@ -136,58 +136,58 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: profile
-         default: '{profile}'
-         description: 'Profile in which this job installs'
+          name: profile
+          default: '{profile}'
+          description: 'Profile in which this job installs'
 
       - bool:
           name: configurePod
@@ -195,9 +195,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -210,9 +210,9 @@
           description: "Onus per PonPort"
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -220,12 +220,12 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/{test-repo}'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/{test-repo}'
+            branches:
+              - '{branch}'
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H {time} * * *
 
@@ -243,48 +243,48 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -292,9 +292,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/{test-repo}'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/{test-repo}'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -315,43 +315,43 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -359,9 +359,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -382,53 +382,53 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -436,9 +436,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -456,9 +456,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
 - job-template:
     name: 'build_{config-pod}_seba_release_{release}'
@@ -474,58 +474,58 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -533,9 +533,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
       - bool:
           name: installBBSim
@@ -553,12 +553,12 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H {time} * * *
 
@@ -576,48 +576,48 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -625,9 +625,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -649,48 +649,48 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'kailash@opennetworking.org, you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -698,9 +698,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
@@ -722,53 +722,53 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: profile
-         default: '{profile}'
-         description: 'Profile in which this job installs'
+          name: profile
+          default: '{profile}'
+          description: 'Profile in which this job installs'
 
       - string:
-         name: notificationEmail
-         default: 'luca@opennetworking.org, teo@opennetworking.org, weiyu@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'luca@opennetworking.org, teo@opennetworking.org, weiyu@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -786,9 +786,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/cord-tester'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/cord-tester'
+            branches:
+              - '{branch}'
 
 - job-template:
     name: 'build_{config-pod}_voltha_{release}'
@@ -804,58 +804,58 @@
 
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: oltDebVersion
-         default: '{oltDebVersion}'
-         description: 'OLT Software version to install'
+          name: oltDebVersion
+          default: '{oltDebVersion}'
+          description: 'OLT Software version to install'
 
       - string:
-         name: helmRepoUrl
-         default: 'https://charts.opencord.org'
-         description: 'URL where helm-charts are published'
+          name: helmRepoUrl
+          default: 'https://charts.opencord.org'
+          description: 'URL where helm-charts are published'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
       - bool:
           name: configurePod
@@ -863,9 +863,9 @@
           description: "Configure POD via TOSCA post build"
 
       - bool:
-            name: reinstallOlt
-            default: true
-            description: "Re-install olt software bringing up CORD"
+          name: reinstallOlt
+          default: true
+          description: "Re-install olt software bringing up CORD"
 
     concurrent: true
 
@@ -873,12 +873,12 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/voltha-system-tests'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/voltha-system-tests'
+            branches:
+              - '{branch}'
 
     triggers:
-       - timed: |
+      - timed: |
                  TZ=America/Los_Angeles
                  H {time} * * *
 
@@ -893,51 +893,50 @@
                   Copyright (c) 2017 Open Networking Foundation (ONF)
 
     <<: *test-pipe-job-boiler-plate
-
     parameters:
       - string:
-         name: TestNodeName
-         default: '{testvm}'
-         description: 'Jenkins node name of TestVM Node'
+          name: TestNodeName
+          default: '{testvm}'
+          description: 'Jenkins node name of TestVM Node'
 
       - string:
-         name: cordRepoUrl
-         default: '{gerrit-server-url}'
-         description: 'The URL of the CORD Project repository'
+          name: cordRepoUrl
+          default: '{gerrit-server-url}'
+          description: 'The URL of the CORD Project repository'
 
       - string:
-         name: configBaseDir
-         default: 'pod-configs'
-         description: 'The directory inside the POD configs repository'
+          name: configBaseDir
+          default: 'pod-configs'
+          description: 'The directory inside the POD configs repository'
 
       - string:
-         name: configDeploymentDir
-         default: 'deployment-configs'
-         description: 'The deployment configs folder'
+          name: configDeploymentDir
+          default: 'deployment-configs'
+          description: 'The deployment configs folder'
 
       - string:
-         name: configKubernetesDir
-         default: 'kubernetes-configs'
-         description: 'The kubernetes config folder'
+          name: configKubernetesDir
+          default: 'kubernetes-configs'
+          description: 'The kubernetes config folder'
 
       - string:
-         name: configToscaDir
-         default: 'tosca-configs'
-         description: 'The tosca config folder'
+          name: configToscaDir
+          default: 'tosca-configs'
+          description: 'The tosca config folder'
 
       - string:
-         name: configFileName
-         default: '{config-pod}'
-         description: 'The config file'
+          name: configFileName
+          default: '{config-pod}'
+          description: 'The config file'
 
       - string:
-         name: branch
-         default: '{branch}'
+          name: branch
+          default: '{branch}'
 
       - string:
-         name: notificationEmail
-         default: 'you@opennetworking.org, suchitra@opennetworking.org'
-         description: ''
+          name: notificationEmail
+          default: 'you@opennetworking.org, suchitra@opennetworking.org'
+          description: ''
 
     concurrent: true
 
@@ -945,9 +944,9 @@
       script-path: '{Jenkinsfile}'
       scm:
         - git:
-           url: '{gerrit-server-url}/voltha-system-tests'
-           branches:
-             - '{branch}'
+            url: '{gerrit-server-url}/voltha-system-tests'
+            branches:
+              - '{branch}'
 
     triggers:
       - reverse:
diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
index 381f38c..5b43eb0 100644
--- a/jjb/cord-test/seba-release.yaml
+++ b/jjb/cord-test/seba-release.yaml
@@ -11,50 +11,50 @@
     jobs:
       # onlab pod1 build 1.0
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1-voltha16'
-         release: '1.0'
-         branch: 'cord-6.1'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master-voltha16.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1-voltha16'
+          release: '1.0'
+          branch: 'cord-6.1'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master-voltha16.deb'
 
       # onlab pod1 build 2.0
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1'
-         release: '2.0'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1'
+          release: '2.0'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master.deb'
 
       # onlab pod1 test job - release 2.0 test job
       - 'build_pod_release_test':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod1'
-         release: '2.0'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod1'
+          release: '2.0'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # onlab pod2 build
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod2'
-         release: '1.0'
-         branch: 'cord-6.1'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod2'
+          release: '1.0'
+          branch: 'cord-6.1'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master.deb'
 
       # onlab pod2 build 2.0
       - 'build_pod_manual_release':
-         testvm: 'onf-build'
-         config-pod: 'onlab-pod2'
-         release: '2.0'
-         branch: 'master'
-         Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
-         oltDebVersion: 'openolt-master.deb'
+          testvm: 'onf-build'
+          config-pod: 'onlab-pod2'
+          release: '2.0'
+          branch: 'master'
+          Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+          oltDebVersion: 'openolt-master.deb'
 
       # flex OCP pod with olt/onu - release 2.0 build job
-      #- 'build_pod_release':
+      # - 'build_pod_release':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '1.0'
@@ -64,7 +64,7 @@
       #   time: '3'
 
       # flex OCP pod with olt/onu - release 2.0 build job
-      #- 'build_pod_release':
+      # - 'build_pod_release':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0'
@@ -74,7 +74,7 @@
       #   time: '5'
 
       # flex OCP POD with olt/onu - release 1.0 test job
-      #- 'build_pod_release_test':
+      # - 'build_pod_release_test':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '1.0'
@@ -82,7 +82,7 @@
       #   Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # flex OCP POD with olt/onu - release 2.0 test job
-      #- 'build_pod_release_test':
+      # - 'build_pod_release_test':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0'
@@ -90,7 +90,7 @@
       #   Jenkinsfile: 'Jenkinsfile-attworkflow-test'
 
       # flex OCP pod with olt/onu : using voltha latest(master)
-      #- 'build_pod_release':
+      # - 'build_pod_release':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0-microcharts'
@@ -100,7 +100,7 @@
       #   time: '7'
 
       # flex OCP test job - release 2.0 test job
-      #- 'build_pod_release_test':
+      # - 'build_pod_release_test':
       #   testvm: 'qa-testvm-pod'
       #   config-pod: 'flex-ocp-cord'
       #   release: '2.0-microcharts'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 8a0b31c..8bbf696 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -11,43 +11,44 @@
     jobs:
       # flex OCP pod with olt/onu - release voltha2.0 build job
       - 'build_pod_manual':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         release: '2.0'
-         branch: 'master'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-build'
-         oltDebVersion: 'openolt-seba-2.0.deb'
-         profile: 'multipleGem'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.0'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          oltDebVersion: 'openolt-seba-2.0.deb'
+          profile: 'multipleGem'
 
       # flex pod1 test job - using voltha branch
       - 'build_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         profile: 'multipleGem'
-         branch: 'master'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          profile: 'multipleGem'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-test'
 
       # flex OCP pod with olt/onu - timer based job
       - 'build_voltha_pod_release':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         release: '2.1'
-         branch: 'master'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-build'
-         oltDebVersion: 'openolt-seba-2.0.deb'
-         configurePod: true
-         time: '1'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.1'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          oltDebVersion: 'openolt-seba-2.0.deb'
+          configurePod: true
+          time: '1'
 
      # flex pod1 test job - using voltha branch
       - 'build_voltha_pod_test':
-         testvm: 'qa-testvm-pod'
-         config-pod: 'flex-ocp-cord'
-         profile: 'multipleGem'
-         branch: 'master'
-         release: '2.1'
-         test-repo: 'voltha-system-tests'
-         Jenkinsfile: 'Jenkinsfile-voltha-test'
+          testvm: 'qa-testvm-pod'
+          config-pod: 'flex-ocp-cord'
+          release: '2.1'
+          branch: 'master'
+          test-repo: 'voltha-system-tests'
+          Jenkinsfile: 'Jenkinsfile-voltha-build'
+          oltDebVersion: 'openolt-seba-2.0.deb'
+          configurePod: true