Rector: Cleanup for pre-commit

Change-Id: Ibf927ea663b1658c9e7cc6fb8b72ab81be2b69ef
Issue-ID: CIMAN-33
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

9 files changed, 204 insertions, 221 deletions

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 77ef5e758..190f23e65 100644
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -7,81 +7,62 @@
 
 - project:
     name: vnfsdk-dovetail-integration
-    project-name: 'vnfsdk-dovetail-integration'
+    project-name: "vnfsdk-dovetail-integration"
     subproject:
       - dovetail-integration:
-          path: '.'
-          pattern: '**'
-    project: 'vnfsdk/dovetail-integration'
-    pom: 'pom.xml'
+          path: "."
+          pattern: "**"
+    project: "vnfsdk/dovetail-integration"
+    pom: "pom.xml"
     python-version: python2.7
-    tox-dir: '.'
-    tox-envs: ''
+    tox-dir: "."
+    tox-envs: ""
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-dovetail-integration-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-dovetail-integration-settings"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
-      - '{project-name}-{stream}-docker-java-daily':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
-          mvn-params: '-Dmaven.test.skip=true'
+      - "{project-name}-{stream}-{subproject}-verify-python"
+      - "{project-name}-{stream}-{subproject}-merge-java"
+      - "{project-name}-{subproject}-python-staging-{stream}"
+      - "{project-name}-{subproject}-python-release-{stream}"
+      - "{project-name}-{stream}-docker-java-daily":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-Dmaven.test.skip=true"
           build-node: ubuntu1804-docker-8c-8g
-#- project:
-#    name: vnfsdk-dovetail-integration-arm64
-#    project-name: 'vnfsdk-dovetail-integration-arm64'
-#    project: 'vnfsdk/dovetail-integration'
-#    pom: 'pom.xml'
-#    python-version: python2.7
-#    tox-dir: '.'
-#    tox-envs: ''
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'vnfsdk-dovetail-integration-settings'
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#
 - project:
     name: vnfsdk-dovetail-integration-tox-sonar
     jobs:
       - gerrit-tox-sonar
-    cron: '@daily'
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vnfsdk/dovetail-integration'
-    project-name: 'vnfsdk-dovetail-integration'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-dovetail-integration-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vnfsdk/dovetail-integration"
+    project-name: "vnfsdk-dovetail-integration"
+    branch: "master"
+    mvn-settings: "vnfsdk-dovetail-integration-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vnfsdk-dovetail-integration-info
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos8-builder-2c-1g
-    project: 'vnfsdk/dovetail-integration'
-    project-name: 'vnfsdk-dovetail-integration'
-    branch: 'master'
+    project: "vnfsdk/dovetail-integration"
+    project-name: "vnfsdk-dovetail-integration"
+    branch: "master"
 
 - project:
     name: vnfsdk-dovetail-integration-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vnfsdk/dovetail-integration
-    project-name: 'vnfsdk-dovetail-integration'
+    project-name: "vnfsdk-dovetail-integration"
     build-node: ubuntu1804-builder-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-dovetail-integration-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-dovetail-integration-settings"
diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index 25a7b49dc..327650a19 100644
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -1,23 +1,23 @@
 ---
 - project:
     name: vnfsdk-functest
-    project-name: 'vnfsdk-functest'
+    project-name: "vnfsdk-functest"
     jobs:
-    - '{project-name}-{stream}-verify-java'
-    - '{project-name}-{stream}-merge-java'
-    - gerrit-maven-stage:
-        sbom-generator: true
-        sign-artifacts: true
-        build-node: centos8-docker-4c-4g
-        maven-versions-plugin: true
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
 
-    project: 'vnfsdk/functest'
+    project: "vnfsdk/functest"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-functest-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-functest-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -25,19 +25,19 @@
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos8-builder-2c-1g
-    project: 'vnfsdk/functest'
-    project-name: 'vnfsdk-functest'
-    branch: 'master'
+    project: "vnfsdk/functest"
+    project-name: "vnfsdk-functest"
+    branch: "master"
 
 - project:
     name: vnfsdk-functest-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vnfsdk/functest
-    project-name: 'vnfsdk-functest'
+    project-name: "vnfsdk-functest"
     build-node: ubuntu1804-builder-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-functest-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-functest-settings"
diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml
index c1f2408ce..266804ed9 100644
--- a/jjb/vnfsdk/vnfsdk-lctest.yaml
+++ b/jjb/vnfsdk/vnfsdk-lctest.yaml
@@ -1,21 +1,21 @@
 ---
 - project:
     name: vnfsdk-lctest
-    project: 'vnfsdk/lctest'
+    project: "vnfsdk/lctest"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-    project-name: 'vnfsdk-lctest'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+    project-name: "vnfsdk-lctest"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-lctest-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-lctest-settings"
 
 - project:
     name: vnfsdk-lctest-info
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos8-builder-2c-1g
-    project: 'vnfsdk/lctest'
-    project-name: 'vnfsdk-lctest'
-    branch: 'master'
+    project: "vnfsdk/lctest"
+    project-name: "vnfsdk-lctest"
+    branch: "master"
diff --git a/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml b/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml
index 2a970b3a4..ee06edb40 100644
--- a/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-marketplace-csit.yaml
@@ -1,14 +1,15 @@
+---
 - project:
     name: vnfsdk-marketplace-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vnfsdk-marketplace'
-    recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "vnfsdk-marketplace"
+    recipients: "kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuites':
+      - "testsuites":
           trigger_jobs:
-    robot-options: ''
+    robot-options: ""
diff --git a/jjb/vnfsdk/vnfsdk-model.yaml b/jjb/vnfsdk/vnfsdk-model.yaml
index 5ef1b6796..59cf6eefb 100644
--- a/jjb/vnfsdk/vnfsdk-model.yaml
+++ b/jjb/vnfsdk/vnfsdk-model.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
     name: vnfsdk-model
-    project: 'vnfsdk/model'
+    project: "vnfsdk/model"
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos8-builder-2c-1g
diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index c39e25fba..8015f0340 100644
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -1,43 +1,43 @@
 ---
 - project:
     name: vnfsdk-pkgtools
-    project-name: 'vnfsdk-pkgtools'
+    project-name: "vnfsdk-pkgtools"
     python-version: python3
-    tox-dir: '.'
-    tox-envs: ''
+    tox-dir: "."
+    tox-envs: ""
     subproject:
       - pkgtools:
-          path: '.'
-          pattern: '**'
-    project: 'vnfsdk/pkgtools'
+          path: "."
+          pattern: "**"
+    project: "vnfsdk/pkgtools"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-pkgtools-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-pkgtools-settings"
     build-node: ubuntu1804-builder-4c-4g
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{subproject}-python-staging-{stream}'
-      - '{project-name}-{subproject}-python-release-{stream}'
+      - "{project-name}-{stream}-{subproject}-verify-python"
+      - "{project-name}-{subproject}-python-staging-{stream}"
+      - "{project-name}-{subproject}-python-release-{stream}"
 
 - project:
     name: vnfsdk-pkgtools-tox-sonar
     jobs:
       - gerrit-tox-sonar
-    cron: '@daily'
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vnfsdk/pkgtools'
-    project-name: 'vnfsdk-pkgtools'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-pkgtools-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vnfsdk/pkgtools"
+    project-name: "vnfsdk-pkgtools"
+    branch: "master"
+    mvn-settings: "vnfsdk-pkgtools-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vnfsdk-pkgtools-info
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos8-builder-2c-1g
-    project: 'vnfsdk/pkgtools'
-    project-name: 'vnfsdk-pkgtools'
-    branch: 'master'
+    project: "vnfsdk/pkgtools"
+    project-name: "vnfsdk-pkgtools"
+    branch: "master"
diff --git a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
index bff645b9e..8589598dd 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo-csit.yaml
@@ -1,14 +1,15 @@
+---
 - project:
     name: vnfsdk-refrepo-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vnfsdk-refrepo'
-    recipients: 'kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "vnfsdk-refrepo"
+    recipients: "kanagaraj.manickam@huawei.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'testsuites':
+      - "testsuites":
           trigger_jobs:
-    robot-options: ''
+    robot-options: ""
diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index ad34dc87b..c7f266a6c 100644
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -1,10 +1,10 @@
 ---
 - project:
     name: vnfsdk-refrepo
-    project-name: 'vnfsdk-refrepo'
+    project-name: "vnfsdk-refrepo"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
@@ -14,19 +14,19 @@
           build-node: centos8-docker-8c-8g
           sbom-generator: true
           maven-versions-plugin: true
-          mvn-goals: 'clean package -Pdocker'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-goals: "clean package -Pdocker"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'vnfsdk/refrepo'
+    project: "vnfsdk/refrepo"
     stream:
-        - 'master':
-                branch: 'master'
-                java-version: openjdk11
-    mvn-settings: 'vnfsdk-refrepo-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    mvn-settings: "vnfsdk-refrepo-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -35,40 +35,40 @@
       - gerrit-maven-sonar
     java-version: openjdk11
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vnfsdk/refrepo'
-    project-name: 'vnfsdk-refrepo'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-refrepo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vnfsdk/refrepo"
+    project-name: "vnfsdk-refrepo"
+    branch: "master"
+    mvn-settings: "vnfsdk-refrepo-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vnfsdk-refrepo-info
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos8-builder-2c-1g
-    project: 'vnfsdk/refrepo'
-    project-name: 'vnfsdk-refrepo'
-    branch: 'master'
+    project: "vnfsdk/refrepo"
+    project-name: "vnfsdk-refrepo"
+    branch: "master"
 
 - project:
     name: vnfsdk-refrepo-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vnfsdk/refrepo
-    project-name: 'vnfsdk-refrepo'
+    project-name: "vnfsdk-refrepo"
     build-node: ubuntu1804-builder-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-refrepo-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-refrepo-settings"
 
 - project:
     name: vnfsdk-refrepo-sonar-verify
@@ -78,13 +78,13 @@
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: centos8-docker-8c-8g
-    project: 'vnfsdk/refrepo'
-    project-name: 'vnfsdk-refrepo'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-refrepo-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vnfsdk/refrepo"
+    project-name: "vnfsdk-refrepo"
+    branch: "master"
+    mvn-settings: "vnfsdk-refrepo-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 76f1625b8..33b311004 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -1,25 +1,25 @@
 ---
 - project:
     name: vnfsdk-validation
-    project-name: 'vnfsdk-validation'
+    project-name: "vnfsdk-validation"
     jobs:
-    - '{project-name}-{stream}-verify-java'
-    - '{project-name}-{stream}-merge-java'
-    - gerrit-maven-stage:
-        sbom-generator: true
-        sign-artifacts: true
-        build-node: centos8-docker-4c-4g
-        maven-versions-plugin: true
-    - '{project-name}-gerrit-release-jobs':
-        build-node: centos7-docker-2c-1g
-    project: 'vnfsdk/validation'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "vnfsdk/validation"
     stream:
-        - 'master':
-            branch: 'master'
-            java-version: openjdk11
-    mvn-settings: 'vnfsdk-validation-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    mvn-settings: "vnfsdk-validation-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -28,55 +28,55 @@
       - gerrit-maven-sonar
     java-version: openjdk11
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vnfsdk/validation'
-    project-name: 'vnfsdk-validation'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-validation-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vnfsdk/validation"
+    project-name: "vnfsdk-validation"
+    branch: "master"
+    mvn-settings: "vnfsdk-validation-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vnfsdk-validation-info
     jobs:
       - gerrit-info-yaml-verify
     build-node: centos8-builder-2c-1g
-    project: 'vnfsdk/validation'
-    project-name: 'vnfsdk-validation'
-    branch: 'master'
+    project: "vnfsdk/validation"
+    project-name: "vnfsdk-validation"
+    branch: "master"
 
 - project:
     name: vnfsdk-validation-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vnfsdk/validation
-    project-name: 'vnfsdk-validation'
+    project-name: "vnfsdk-validation"
     build-node: ubuntu1804-builder-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vnfsdk-validation-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vnfsdk-validation-settings"
 
 - project:
-      name: vnfsdk-validation-upload-docs
-      project: 'vnfsdk/validation'
-      project-name: 'vnfsdk-requirements'
-      mvn-settings: 'vnfsdk-validation-settings'
-      mvn-global-settings: 'global-settings'
-      stream:
-          - 'master':
-                branch: 'master'
-      jobs:
-          - '{project-name}-{stream}-build-and-upload':
-                pre_script: !include-raw-escape: ./generate-dosc.sh
-                project_id: org.onap.vnfsdk.validation
-                post_script: !include-raw-escape: ./upload-artifact.sh
+    name: vnfsdk-validation-upload-docs
+    project: "vnfsdk/validation"
+    project-name: "vnfsdk-requirements"
+    mvn-settings: "vnfsdk-validation-settings"
+    mvn-global-settings: "global-settings"
+    stream:
+      - "master":
+          branch: "master"
+    jobs:
+      - "{project-name}-{stream}-build-and-upload":
+          pre_script: !include-raw-escape: ./generate-dosc.sh
+          project_id: org.onap.vnfsdk.validation
+          post_script: !include-raw-escape: ./upload-artifact.sh
 
 - project:
     name: vnfsdk-validation-sonar-verify
@@ -86,13 +86,13 @@
     jobs:
       - gerrit-maven-sonar-verify
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: centos8-docker-8c-8g
-    project: 'vnfsdk/validation'
-    project-name: 'vnfsdk-validation'
-    branch: 'master'
-    mvn-settings: 'vnfsdk-validation-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vnfsdk/validation"
+    project-name: "vnfsdk-validation"
+    branch: "master"
+    mvn-settings: "vnfsdk-validation-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"