Refactor: Cleanup for pre-commit

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

7 files changed, 382 insertions, 382 deletions

diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
index ddbd20090..de65d8211 100644
--- a/jjb/cps/cps-cps-tbdmt.yaml
+++ b/jjb/cps/cps-cps-tbdmt.yaml
@@ -1,17 +1,17 @@
 ---
 - project:
-    name: cps-tbdmt-project-view
-    project-name: cps-cps-tbdmt
-    views:
-      - project-view
+      name: cps-tbdmt-project-view
+      project-name: cps-cps-tbdmt
+      views:
+          - project-view
 
 - project:
-    name: cps-tbdmt-info
-    project: cps/cps-tbdmt
-    project-name: cps-cps-tbdmt
-    build-node: centos8-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
+      name: cps-tbdmt-info
+      project: cps/cps-tbdmt
+      project-name: cps-cps-tbdmt
+      build-node: centos8-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
 
 - project:
       name: cps-tbdmt-clm
@@ -20,11 +20,11 @@
       maven-version: "mvn36"
       jobs:
           - gerrit-maven-clm
-      nexus-iq-namespace: 'onap-'
+      nexus-iq-namespace: "onap-"
       project: cps/cps-tbdmt
       project-name: cps-cps-tbdmt
-      branch: 'master'
-      mvn-settings: 'cps-cps-tbdmt-settings'
+      branch: "master"
+      mvn-settings: "cps-cps-tbdmt-settings"
       build-node: centos8-docker-8c-8g
 
 - project:
@@ -34,11 +34,11 @@
       maven-version: "mvn36"
       project-name: cps-cps-tbdmt
       project: cps/cps-tbdmt
-      mvn-snapshot-id: 'ecomp-snapshots'
-      nexus-snapshot-repo: 'snapshots'
+      mvn-snapshot-id: "ecomp-snapshots"
+      nexus-snapshot-repo: "snapshots"
       jobs:
           - gerrit-maven-verify:
-                mvn-goals: 'clean install'
+                mvn-goals: "clean install"
           - gerrit-maven-merge
           - gerrit-maven-stage:
                 sign-artifacts: true
@@ -47,17 +47,17 @@
           - gerrit-maven-docker-stage:
                 build-node: centos8-docker-8c-8g
                 maven-versions-plugin: true
-                mvn-params: '-P docker'
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-          - '{project-name}-gerrit-release-jobs':
+                mvn-params: "-P docker"
+                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
       stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'cps-cps-tbdmt-settings'
-      files: '**'
-      archive-artifacts: ''
+          - "master":
+                branch: "master"
+      mvn-settings: "cps-cps-tbdmt-settings"
+      files: "**"
+      archive-artifacts: ""
       build-node: centos8-docker-8c-8g
 
 - project:
@@ -68,34 +68,34 @@
       jobs:
           - gerrit-maven-sonar
       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: centos8-docker-8c-8g
-      project: 'cps/cps-tbdmt'
-      project-name: 'cps-cps-tbdmt'
-      branch: 'master'
-      mvn-settings: 'cps-cps-tbdmt-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      project: "cps/cps-tbdmt"
+      project-name: "cps-cps-tbdmt"
+      branch: "master"
+      mvn-settings: "cps-cps-tbdmt-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: cps-tbdmt-sonar-verify
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    jobs:
-      - gerrit-maven-sonar-verify
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-qualitygate-wait: true
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos8-docker-8c-8g
-    project: 'cps/cps-tbdmt'
-    project-name: 'cps-cps-tbdmt'
-    branch: 'master'
-    mvn-settings: 'cps-cps-tbdmt-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: cps-tbdmt-sonar-verify
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-sonar-verify
+      sonarcloud: true
+      sonarcloud-project-organization: "{sonarcloud_project_organization}"
+      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+      sonarcloud-qualitygate-wait: true
+      sonar-mvn-goal: "{sonar_mvn_goal}"
+      build-node: centos8-docker-8c-8g
+      project: "cps/cps-tbdmt"
+      project-name: "cps-cps-tbdmt"
+      branch: "master"
+      mvn-settings: "cps-cps-tbdmt-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml
index 362ef580d..2bf9391c7 100644
--- a/jjb/cps/cps-cps-temporal-csit.yaml
+++ b/jjb/cps/cps-cps-temporal-csit.yaml
@@ -2,22 +2,22 @@
 - project:
       name: cps-cps-temporal-csit
       jobs:
-          - '{project-name}-review-verification-maven-{stream}':
+          - "{project-name}-review-verification-maven-{stream}":
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker'
-          - '{project-name}-merge-verification-maven-{stream}':
+                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
+          - "{project-name}-merge-verification-maven-{stream}":
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker'
-      project-name: 'cps-cps-temporal'
-      recipients: 'toine.siebelink@est.tech'
+                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
+      project-name: "cps-cps-temporal"
+      recipients: "toine.siebelink@est.tech"
       # project name in gerrit
-      project: 'cps/cps-temporal'
+      project: "cps/cps-temporal"
       stream:
-          - 'master':
-                branch: 'master'
-          - 'jakarta':
-                branch: 'jakarta'
-          - 'kohn':
-                branch: 'kohn'
-      mvn-settings: 'cps-cps-temporal-settings'
-      robot-options: ''
+          - "master":
+                branch: "master"
+          - "jakarta":
+                branch: "jakarta"
+          - "kohn":
+                branch: "kohn"
+      mvn-settings: "cps-cps-temporal-settings"
+      robot-options: ""
diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index cf4f66dc1..cf7a524d5 100644
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -1,105 +1,105 @@
 ---
 - project:
-    name: cps-cps-temporal-project-view
-    project-name: cps-cps-temporal
-    views:
-      - project-view
+      name: cps-cps-temporal-project-view
+      project-name: cps-cps-temporal
+      views:
+          - project-view
 
 - project:
-    name: cps-cps-temporal-info
-    project: cps/cps-temporal
-    project-name: cps-cps-temporal
-    build-node: centos8-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
+      name: cps-cps-temporal-info
+      project: cps/cps-temporal
+      project-name: cps-cps-temporal
+      build-node: centos8-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
 
 - project:
-    name: cps-cps-temporal
-    java-version: openjdk11
-    mvn-version: mvn36
-    maven-version: mvn36
-    project-name: cps-cps-temporal
-    project: cps/cps-temporal
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    jobs:
-      - gerrit-maven-docker-verify:
-          container-public-registry: nexus3.onap.org:10001
-      - gerrit-maven-docker-merge:
-          container-public-registry: nexus3.onap.org:10001
-          container-snapshot-registry: nexus3.onap.org:10003
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: -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
-    stream:
-      - 'master':
-          branch: master
-      - 'jakarta':
-          branch: 'jakarta'
-          cron: ''
-      - 'kohn':
-          branch: 'kohn'
-          cron: ''
-    mvn-settings: cps-cps-temporal-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: centos8-docker-8c-8g
+      name: cps-cps-temporal
+      java-version: openjdk11
+      mvn-version: mvn36
+      maven-version: mvn36
+      project-name: cps-cps-temporal
+      project: cps/cps-temporal
+      mvn-snapshot-id: "ecomp-snapshots"
+      nexus-snapshot-repo: "snapshots"
+      jobs:
+          - gerrit-maven-docker-verify:
+                container-public-registry: nexus3.onap.org:10001
+          - gerrit-maven-docker-merge:
+                container-public-registry: nexus3.onap.org:10001
+                container-snapshot-registry: nexus3.onap.org:10003
+          - gerrit-maven-docker-stage:
+                build-node: centos8-docker-8c-8g
+                maven-versions-plugin: true
+                mvn-params: -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
+      stream:
+          - "master":
+                branch: master
+          - "jakarta":
+                branch: "jakarta"
+                cron: ""
+          - "kohn":
+                branch: "kohn"
+                cron: ""
+      mvn-settings: cps-cps-temporal-settings
+      files: "**"
+      archive-artifacts: ""
+      build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps-cps-temporal-clm
-    java-version: openjdk11
-    mvn-version: mvn36
-    maven-version: mvn36
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: onap-
-    project: cps/cps-temporal
-    project-name: cps-cps-temporal
-    branch: master
-    mvn-settings: cps-cps-temporal-settings
-    build-node: centos8-docker-8c-8g
+      name: cps-cps-temporal-clm
+      java-version: openjdk11
+      mvn-version: mvn36
+      maven-version: mvn36
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: onap-
+      project: cps/cps-temporal
+      project-name: cps-cps-temporal
+      branch: master
+      mvn-settings: cps-cps-temporal-settings
+      build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps-cps-temporal-sonar
-    java-version: openjdk11
-    mvn-version: mvn36
-    maven-version: mvn36
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: centos8-docker-8c-8g
-    project: 'cps/cps-temporal'
-    project-name: 'cps-cps-temporal'
-    branch: 'master'
-    mvn-settings: 'cps-cps-temporal-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: cps-cps-temporal-sonar
+      java-version: openjdk11
+      mvn-version: mvn36
+      maven-version: mvn36
+      jobs:
+          - gerrit-maven-sonar
+      sonarcloud: true
+      sonarcloud-project-organization: "{sonarcloud_project_organization}"
+      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+      sonar-mvn-goal: "{sonar_mvn_goal}"
+      cron: "@daily"
+      build-node: centos8-docker-8c-8g
+      project: "cps/cps-temporal"
+      project-name: "cps-cps-temporal"
+      branch: "master"
+      mvn-settings: "cps-cps-temporal-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: cps-cps-temporal-sonar-verify
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    jobs:
-      - gerrit-maven-sonar-verify
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-qualitygate-wait: true
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos8-docker-8c-8g
-    project: 'cps/cps-temporal'
-    project-name: 'cps-cps-temporal'
-    branch: 'master'
-    mvn-settings: 'cps-cps-temporal-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: cps-cps-temporal-sonar-verify
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-sonar-verify
+      sonarcloud: true
+      sonarcloud-project-organization: "{sonarcloud_project_organization}"
+      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+      sonarcloud-qualitygate-wait: true
+      sonar-mvn-goal: "{sonar_mvn_goal}"
+      build-node: centos8-docker-8c-8g
+      project: "cps/cps-temporal"
+      project-name: "cps-cps-temporal"
+      branch: "master"
+      mvn-settings: "cps-cps-temporal-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index ec61636d5..078249b73 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -2,24 +2,24 @@
 - project:
       name: cps-csit
       jobs:
-          - '{project-name}-review-verification-maven-{stream}':
+          - "{project-name}-review-verification-maven-{stream}":
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
-          - '{project-name}-merge-verification-maven-{stream}':
+                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+          - "{project-name}-merge-verification-maven-{stream}":
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push='
-      project-name: 'cps'
+                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+      project-name: "cps"
       build-node: ubuntu1804-docker-8c-8g
-      recipients: 'toine.siebelink@est.tech'
+      recipients: "toine.siebelink@est.tech"
       # project name in gerrit
-      project: 'cps'
+      project: "cps"
       stream:
-          - 'master':
-                branch: 'master'
-          - 'jakarta':
-                branch: 'jakarta'
-          - 'kohn':
-                branch: 'kohn'
-      mvn-settings: 'cps-settings'
-      robot-options: ''
-      branch: 'master'
+          - "master":
+                branch: "master"
+          - "jakarta":
+                branch: "jakarta"
+          - "kohn":
+                branch: "kohn"
+      mvn-settings: "cps-settings"
+      robot-options: ""
+      branch: "master"
diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
index e43de258d..1dd6a962a 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -2,22 +2,22 @@
 - project:
       name: cps-ncmp-dmi-plugin-csit
       jobs:
-          - '{project-name}-review-verification-maven-{stream}':
+          - "{project-name}-review-verification-maven-{stream}":
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Pdocker'
-          - '{project-name}-merge-verification-maven-{stream}':
+                mvn-params: "-Dmaven.test.skip=true -Pdocker"
+          - "{project-name}-merge-verification-maven-{stream}":
                 mvn-goals: clean install
-                mvn-params: '-Dmaven.test.skip=true -Pdocker'
-      project-name: 'cps-ncmp-dmi-plugin'
-      recipients: 'toine.siebelink@est.tech'
+                mvn-params: "-Dmaven.test.skip=true -Pdocker"
+      project-name: "cps-ncmp-dmi-plugin"
+      recipients: "toine.siebelink@est.tech"
       # project name in gerrit
-      project: 'cps/ncmp-dmi-plugin'
+      project: "cps/ncmp-dmi-plugin"
       stream:
-          - 'master':
-                branch: 'master'
-          - 'jakarta':
-                branch: 'jakarta'
-          - 'kohn':
-                branch: 'kohn'
-      mvn-settings: 'cps-ncmp-dmi-plugin-settings'
-      robot-options: ''
+          - "master":
+                branch: "master"
+          - "jakarta":
+                branch: "jakarta"
+          - "kohn":
+                branch: "kohn"
+      mvn-settings: "cps-ncmp-dmi-plugin-settings"
+      robot-options: ""
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 96b1dd467..e03308eff 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -1,111 +1,111 @@
 ---
 - project:
-    name: cps-ncmp-dmi-plugin-project-view
-    project-name: cps-ncmp-dmi-plugin
-    views:
-      - project-view
+      name: cps-ncmp-dmi-plugin-project-view
+      project-name: cps-ncmp-dmi-plugin
+      views:
+          - project-view
 
 - project:
-    name: cps-ncmp-dmi-plugin-info
-    project: cps/ncmp-dmi-plugin
-    project-name: cps-ncmp-dmi-plugin
-    build-node: centos8-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
+      name: cps-ncmp-dmi-plugin-info
+      project: cps/ncmp-dmi-plugin
+      project-name: cps-ncmp-dmi-plugin
+      build-node: centos8-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
 
 - project:
-    name: cps-ncmp-dmi-plugin
-    java-version: openjdk11
-    mvn-version: mvn36
-    maven-version: mvn36
-    project-name: cps-ncmp-dmi-plugin
-    project: cps/ncmp-dmi-plugin
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-    jobs:
-      - gerrit-maven-docker-verify:
-          container-public-registry: nexus3.onap.org:10001
-      - gerrit-maven-merge
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          sbom-generator: true
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: -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
-    stream:
-      - 'master':
-          branch: master
-      - 'jakarta':
-          branch: 'jakarta'
-          cron: ''
-      - 'kohn':
-          branch: 'kohn'
-          cron: ''
-      - 'london':
-          branch: 'london'
-          cron: ''
-    mvn-settings: cps-ncmp-dmi-plugin-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: centos8-docker-8c-8g
+      name: cps-ncmp-dmi-plugin
+      java-version: openjdk11
+      mvn-version: mvn36
+      maven-version: mvn36
+      project-name: cps-ncmp-dmi-plugin
+      project: cps/ncmp-dmi-plugin
+      mvn-snapshot-id: "ecomp-snapshots"
+      nexus-snapshot-repo: "snapshots"
+      jobs:
+          - gerrit-maven-docker-verify:
+                container-public-registry: nexus3.onap.org:10001
+          - gerrit-maven-merge
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos8-docker-8c-8g
+                maven-versions-plugin: true
+                sbom-generator: true
+          - gerrit-maven-docker-stage:
+                build-node: centos8-docker-8c-8g
+                maven-versions-plugin: true
+                mvn-params: -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
+      stream:
+          - "master":
+                branch: master
+          - "jakarta":
+                branch: "jakarta"
+                cron: ""
+          - "kohn":
+                branch: "kohn"
+                cron: ""
+          - "london":
+                branch: "london"
+                cron: ""
+      mvn-settings: cps-ncmp-dmi-plugin-settings
+      files: "**"
+      archive-artifacts: ""
+      build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps-ncmp-dmi-plugin-clm
-    java-version: openjdk11
-    mvn-version: mvn36
-    maven-version: mvn36
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: onap-
-    project: cps/ncmp-dmi-plugin
-    project-name: cps-ncmp-dmi-plugin
-    branch: master
-    mvn-settings: cps-ncmp-dmi-plugin-settings
-    build-node: centos8-docker-8c-8g
+      name: cps-ncmp-dmi-plugin-clm
+      java-version: openjdk11
+      mvn-version: mvn36
+      maven-version: mvn36
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: onap-
+      project: cps/ncmp-dmi-plugin
+      project-name: cps-ncmp-dmi-plugin
+      branch: master
+      mvn-settings: cps-ncmp-dmi-plugin-settings
+      build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps-ncmp-dmi-plugin-sonar
-    java-version: openjdk11
-    mvn-version: mvn36
-    maven-version: mvn36
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: centos8-docker-8c-8g
-    project: 'cps/ncmp-dmi-plugin'
-    project-name: 'cps-ncmp-dmi-plugin'
-    branch: 'master'
-    mvn-settings: 'cps-ncmp-dmi-plugin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: cps-ncmp-dmi-plugin-sonar
+      java-version: openjdk11
+      mvn-version: mvn36
+      maven-version: mvn36
+      jobs:
+          - gerrit-maven-sonar
+      sonarcloud: true
+      sonarcloud-project-organization: "{sonarcloud_project_organization}"
+      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+      sonar-mvn-goal: "{sonar_mvn_goal}"
+      cron: "@daily"
+      build-node: centos8-docker-8c-8g
+      project: "cps/ncmp-dmi-plugin"
+      project-name: "cps-ncmp-dmi-plugin"
+      branch: "master"
+      mvn-settings: "cps-ncmp-dmi-plugin-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: cps-ncmp-dmi-plugin-sonar-verify
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    jobs:
-      - gerrit-maven-sonar-verify
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-qualitygate-wait: true
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos8-docker-8c-8g
-    project: 'cps/ncmp-dmi-plugin'
-    project-name: 'cps-ncmp-dmi-plugin'
-    branch: 'master'
-    mvn-settings: 'cps-ncmp-dmi-plugin-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: cps-ncmp-dmi-plugin-sonar-verify
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-sonar-verify
+      sonarcloud: true
+      sonarcloud-project-organization: "{sonarcloud_project_organization}"
+      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+      sonarcloud-qualitygate-wait: true
+      sonar-mvn-goal: "{sonar_mvn_goal}"
+      build-node: centos8-docker-8c-8g
+      project: "cps/ncmp-dmi-plugin"
+      project-name: "cps-ncmp-dmi-plugin"
+      branch: "master"
+      mvn-settings: "cps-ncmp-dmi-plugin-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index d0a57a1f4..f3beb5461 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -1,17 +1,17 @@
 ---
 - project:
-    name: cps-project-view
-    project-name: cps
-    views:
-      - project-view
+      name: cps-project-view
+      project-name: cps
+      views:
+          - project-view
 
 - project:
-    name: cps-info
-    project: cps
-    project-name: cps
-    build-node: centos8-builder-2c-1g
-    jobs:
-      - gerrit-info-yaml-verify
+      name: cps-info
+      project: cps
+      project-name: cps
+      build-node: centos8-builder-2c-1g
+      jobs:
+          - gerrit-info-yaml-verify
 
 - project:
       name: cps-clm
@@ -20,91 +20,91 @@
       maven-version: "mvn36"
       jobs:
           - gerrit-maven-clm
-      nexus-iq-namespace: 'onap-'
-      project: 'cps'
-      project-name: 'cps'
-      branch: 'master'
-      mvn-settings: 'cps-settings'
+      nexus-iq-namespace: "onap-"
+      project: "cps"
+      project-name: "cps"
+      branch: "master"
+      mvn-settings: "cps-settings"
       build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    project-name: 'cps'
-    project: 'cps'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: "-P cps-ncmp-docker"
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          sbom-generator: true
-      - gerrit-maven-docker-stage:
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P cps-ncmp-docker'
-          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
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'jakarta':
-          branch: 'jakarta'
-          cron: ''
-      - 'kohn':
-          branch: 'kohn'
-          cron: ''
-      - 'london':
-          branch: 'london'
-          cron: ''
-    mvn-settings: 'cps-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: centos8-docker-8c-8g
+      name: cps
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      project-name: "cps"
+      project: "cps"
+      jobs:
+          - "{project-name}-{stream}-verify-java"
+          - "{project-name}-{stream}-merge-java":
+                docker-pom: "pom.xml"
+                mvn-params: "-P cps-ncmp-docker"
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos8-docker-8c-8g
+                maven-versions-plugin: true
+                sbom-generator: true
+          - gerrit-maven-docker-stage:
+                build-node: centos8-docker-8c-8g
+                maven-versions-plugin: true
+                mvn-params: "-P cps-ncmp-docker"
+                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
+      stream:
+          - "master":
+                branch: "master"
+          - "jakarta":
+                branch: "jakarta"
+                cron: ""
+          - "kohn":
+                branch: "kohn"
+                cron: ""
+          - "london":
+                branch: "london"
+                cron: ""
+      mvn-settings: "cps-settings"
+      files: "**"
+      archive-artifacts: ""
+      build-node: centos8-docker-8c-8g
 
 - project:
-    name: cps-sonar
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: centos8-docker-8c-8g
-    project: 'cps'
-    project-name: 'cps'
-    branch: 'master'
-    mvn-settings: 'cps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: cps-sonar
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-sonar
+      sonarcloud: true
+      sonarcloud-project-organization: "{sonarcloud_project_organization}"
+      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+      sonar-mvn-goal: "{sonar_mvn_goal}"
+      cron: "@daily"
+      build-node: centos8-docker-8c-8g
+      project: "cps"
+      project-name: "cps"
+      branch: "master"
+      mvn-settings: "cps-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: cps-sonar-verify
-    java-version: openjdk11
-    mvn-version: "mvn36"
-    maven-version: "mvn36"
-    jobs:
-      - gerrit-maven-sonar-verify
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonarcloud-qualitygate-wait: true
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    build-node: centos8-docker-8c-8g
-    project: 'cps'
-    project-name: 'cps'
-    branch: 'master'
-    mvn-settings: 'cps-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: cps-sonar-verify
+      java-version: openjdk11
+      mvn-version: "mvn36"
+      maven-version: "mvn36"
+      jobs:
+          - gerrit-maven-sonar-verify
+      sonarcloud: true
+      sonarcloud-project-organization: "{sonarcloud_project_organization}"
+      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+      sonarcloud-qualitygate-wait: true
+      sonar-mvn-goal: "{sonar_mvn_goal}"
+      build-node: centos8-docker-8c-8g
+      project: "cps"
+      project-name: "cps"
+      branch: "master"
+      mvn-settings: "cps-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"