Refactor: Cleanup for pre-commit

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

7 files changed, 444 insertions, 444 deletions

diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
index de65d8211..dbc44aaee 100644
--- a/jjb/cps/cps-cps-tbdmt.yaml
+++ b/jjb/cps/cps-cps-tbdmt.yaml
@@ -1,101 +1,101 @@
 ---
 - 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
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: cps/cps-tbdmt
-      project-name: cps-cps-tbdmt
-      branch: "master"
-      mvn-settings: "cps-cps-tbdmt-settings"
-      build-node: centos8-docker-8c-8g
+    name: cps-tbdmt-clm
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: cps/cps-tbdmt
+    project-name: cps-cps-tbdmt
+    branch: "master"
+    mvn-settings: "cps-cps-tbdmt-settings"
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-tbdmt
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      project-name: cps-cps-tbdmt
-      project: cps/cps-tbdmt
-      mvn-snapshot-id: "ecomp-snapshots"
-      nexus-snapshot-repo: "snapshots"
-      jobs:
-          - gerrit-maven-verify:
-                mvn-goals: "clean install"
-          - gerrit-maven-merge
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-          - 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":
-                build-node: centos7-docker-2c-1g
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "cps-cps-tbdmt-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: centos8-docker-8c-8g
+    name: cps-tbdmt
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    project-name: cps-cps-tbdmt
+    project: cps/cps-tbdmt
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    jobs:
+      - gerrit-maven-verify:
+          mvn-goals: "clean install"
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+      - 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":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "cps-cps-tbdmt-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-tbdmt-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-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
+    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-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 2bf9391c7..4c27b92ca 100644
--- a/jjb/cps/cps-cps-temporal-csit.yaml
+++ b/jjb/cps/cps-cps-temporal-csit.yaml
@@ -1,23 +1,23 @@
 ---
 - project:
-      name: cps-cps-temporal-csit
-      jobs:
-          - "{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-goals: clean install
-                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"
-      stream:
-          - "master":
-                branch: "master"
-          - "jakarta":
-                branch: "jakarta"
-          - "kohn":
-                branch: "kohn"
-      mvn-settings: "cps-cps-temporal-settings"
-      robot-options: ""
+    name: cps-cps-temporal-csit
+    jobs:
+      - "{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-goals: clean install
+          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"
+    stream:
+      - "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 cf7a524d5..67962e7ad 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 078249b73..e61ce2f5b 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -1,25 +1,25 @@
 ---
 - project:
-      name: cps-csit
-      jobs:
-          - "{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-goals: clean install
-                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
-      project-name: "cps"
-      build-node: ubuntu1804-docker-8c-8g
-      recipients: "toine.siebelink@est.tech"
-      # project name in gerrit
-      project: "cps"
-      stream:
-          - "master":
-                branch: "master"
-          - "jakarta":
-                branch: "jakarta"
-          - "kohn":
-                branch: "kohn"
-      mvn-settings: "cps-settings"
-      robot-options: ""
-      branch: "master"
+    name: cps-csit
+    jobs:
+      - "{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-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+    project-name: "cps"
+    build-node: ubuntu1804-docker-8c-8g
+    recipients: "toine.siebelink@est.tech"
+    # project name in gerrit
+    project: "cps"
+    stream:
+      - "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 1dd6a962a..f8e55520e 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -1,23 +1,23 @@
 ---
 - project:
-      name: cps-ncmp-dmi-plugin-csit
-      jobs:
-          - "{project-name}-review-verification-maven-{stream}":
-                mvn-goals: clean install
-                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"
-      # project name in gerrit
-      project: "cps/ncmp-dmi-plugin"
-      stream:
-          - "master":
-                branch: "master"
-          - "jakarta":
-                branch: "jakarta"
-          - "kohn":
-                branch: "kohn"
-      mvn-settings: "cps-ncmp-dmi-plugin-settings"
-      robot-options: ""
+    name: cps-ncmp-dmi-plugin-csit
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean install
+          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"
+    # project name in gerrit
+    project: "cps/ncmp-dmi-plugin"
+    stream:
+      - "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 e03308eff..908f86531 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 f3beb5461..1f6ffe4cc 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -1,110 +1,110 @@
 ---
 - 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
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: "cps"
-      project-name: "cps"
-      branch: "master"
-      mvn-settings: "cps-settings"
-      build-node: centos8-docker-8c-8g
+    name: cps-clm
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-clm
+    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"