Refactor: Cleanup for pre-commit

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

2 files changed, 73 insertions, 75 deletions

diff --git a/jjb/modeling/modeling-etsicatalog-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml
index e699b68a6..4d2248d41 100644
--- a/jjb/modeling/modeling-etsicatalog-csit.yaml
+++ b/jjb/modeling/modeling-etsicatalog-csit.yaml
@@ -1,14 +1,14 @@
 ---
 - project:
-    name: modeling-etsicatalog-csit
-    jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'modeling-etsicatalog'
-    recipients: 'denghui12@huawei.com'
-    stream: 'master'
-    functionality:
-      - 'sanity-check':
-          trigger_jobs: 'modeling-etsicatalog-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
+      name: modeling-etsicatalog-csit
+      jobs:
+          - "{project-name}-{stream}-verify-csit-{functionality}"
+          - "{project-name}-{stream}-csit-{functionality}"
+      project-name: "modeling-etsicatalog"
+      recipients: "denghui12@huawei.com"
+      stream: "master"
+      functionality:
+          - "sanity-check":
+                trigger_jobs: "modeling-etsicatalog-master-docker-java-version-shell-daily"
+      robot-options: ""
+      branch: "master"
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index b36003630..bae65ed3a 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -1,72 +1,70 @@
 ---
-
 - project:
-    name: modeling-etsicatalog
-    project-name: 'modeling-etsicatalog'
-    project: 'modeling/etsicatalog'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'modeling-etsicatalog-settings'
-    subproject:
-      - 'etsicatalog':
-          path: '.'
-          pattern: '**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos8-docker-8c-8g
-          maven-versions-plugin: true
-          sbom-generator: true
+      name: modeling-etsicatalog
+      project-name: "modeling-etsicatalog"
+      project: "modeling/etsicatalog"
+      stream:
+          - "master":
+                branch: "master"
+      mvn-settings: "modeling-etsicatalog-settings"
+      subproject:
+          - "etsicatalog":
+                path: "."
+                pattern: "**"
+      jobs:
+          - "{project-name}-{stream}-{subproject}-verify-python"
+          - "{project-name}-{stream}-verify-java"
+          - "{project-name}-{stream}-merge-java"
+          - gerrit-maven-stage:
+                sign-artifacts: true
+                build-node: centos8-docker-8c-8g
+                maven-versions-plugin: true
+                sbom-generator: true
 
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh'
-          build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+          - "{project-name}-{stream}-docker-java-version-shell-daily":
+                docker-pom: "pom.xml"
+                mvn-goals: "install"
+                script: !include-raw-escape: "build-modeling-etsicatalog-docker-image.sh"
+                build-node: ubuntu1804-docker-8c-8g
+          - "{project-name}-gerrit-release-jobs":
+                build-node: centos7-docker-2c-1g
+      files: "**"
+      archive-artifacts: ""
+      build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: modeling-etsicatalog-sonar
-    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: ubuntu1804-builder-4c-4g
-    project: 'modeling/etsicatalog'
-    project-name: 'modeling-etsicatalog'
-    branch: 'master'
-    mvn-settings: 'modeling-etsicatalog-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: modeling-etsicatalog-sonar
+      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: ubuntu1804-builder-4c-4g
+      project: "modeling/etsicatalog"
+      project-name: "modeling-etsicatalog"
+      branch: "master"
+      mvn-settings: "modeling-etsicatalog-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: modeling-etsicatalog-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: modeling/etsicatalog
-    project-name: 'modeling-etsicatalog'
-    build-node: centos8-redis-4c-4g
-    branch: 'master'
-    mvn-settings: 'modeling-etsicatalog-settings'
+      name: modeling-etsicatalog-clm
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: "onap-"
+      project: modeling/etsicatalog
+      project-name: "modeling-etsicatalog"
+      build-node: centos8-redis-4c-4g
+      branch: "master"
+      mvn-settings: "modeling-etsicatalog-settings"
 
 - project:
-    name: modeling-etsicatalog-info
-    project-name: modeling-etsicatalog
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: modeling/etsicatalog
-    branch: master
+      name: modeling-etsicatalog-info
+      project-name: modeling-etsicatalog
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos8-builder-2c-1g
+      project: modeling/etsicatalog
+      branch: master