Refactor: Cleanup for pre-commit

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

4 files changed, 216 insertions, 253 deletions

diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 314181c03..9678a4dfc 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -1,91 +1,72 @@
 ---
 - project:
-    name: msb-project-view
-    project-name: msb
-    views:
-      - project-view
+      name: msb-project-view
+      project-name: msb
+      views:
+          - project-view
 
 - project:
-    name: msb-apigateway
-    project-name: 'msb-apigateway'
-    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
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-pom: 'distributions/msb-apigateway/pom.xml'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-2c-1g
-    project: 'msb/apigateway'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-apigateway-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+      name: msb-apigateway
+      project-name: "msb-apigateway"
+      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
+          - gerrit-maven-docker-stage:
+                sbom-generator: true
+                build-node: ubuntu1804-docker-8c-8g
+                maven-versions-plugin: true
+                mvn-pom: "distributions/msb-apigateway/pom.xml"
+                container-public-registry: "nexus3.onap.org:10001"
+                container-staging-registry: "nexus3.onap.org:10003"
+                mvn-params: "-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker"
+          - "{project-name}-gerrit-release-jobs":
+                build-node: centos7-docker-2c-1g
+      project: "msb/apigateway"
+      stream:
+          - "master":
+                branch: "master"
+      mvn-settings: "msb-apigateway-settings"
+      files: "**"
+      archive-artifacts: ""
+      build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: msb-apigateway-arm64
-#    project-name: 'msb-apigateway-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-apigateway-docker-image.sh'
-#
-#    project: 'msb/apigateway'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'msb-apigateway-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
 - project:
-    name: msb-apigateway-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: 'msb/apigateway'
-    project-name: 'msb-apigateway'
-    branch: 'master'
-    mvn-settings: 'msb-apigateway-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: msb-apigateway-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: "msb/apigateway"
+      project-name: "msb-apigateway"
+      branch: "master"
+      mvn-settings: "msb-apigateway-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: msb-apigateway-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: msb/apigateway
-    project-name: 'msb-apigateway'
-    branch: 'master'
-    mvn-settings: 'msb-apigateway-settings'
+      name: msb-apigateway-clm
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: "onap-"
+      project: msb/apigateway
+      project-name: "msb-apigateway"
+      branch: "master"
+      mvn-settings: "msb-apigateway-settings"
 
 - project:
-    name: msb-apigateway-info
-    project-name: msb-apigateway
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: msb/apigateway
-    branch: master
+      name: msb-apigateway-info
+      project-name: msb-apigateway
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos8-builder-2c-1g
+      project: msb/apigateway
+      branch: master
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 7b9420420..7bc8eb14e 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -1,84 +1,66 @@
 ---
 - project:
-    name: msb-discovery
-    project-name: 'msb-discovery'
-    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
-      - gerrit-maven-docker-stage:
-          sbom-generator: true
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-pom: 'distributions/msb-discovery/pom.xml'
-          mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-2c-1g
-    project: 'msb/discovery'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+      name: msb-discovery
+      project-name: "msb-discovery"
+      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
+          - gerrit-maven-docker-stage:
+                sbom-generator: true
+                build-node: ubuntu1804-docker-8c-8g
+                maven-versions-plugin: true
+                container-public-registry: "nexus3.onap.org:10001"
+                container-staging-registry: "nexus3.onap.org:10003"
+                mvn-pom: "distributions/msb-discovery/pom.xml"
+                mvn-params: "-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker"
+          - "{project-name}-gerrit-release-jobs":
+                build-node: centos7-docker-2c-1g
+      project: "msb/discovery"
+      stream:
+          - "master":
+                branch: "master"
+      mvn-settings: "msb-discovery-settings"
+      files: "**"
+      archive-artifacts: ""
+      build-node: ubuntu1804-builder-4c-4g
 
-#- project:
-#    name: msb-discovery-arm64
-#    project-name: 'msb-discovery-arm64'
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-version-shell-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-goals: 'install'
-#          script:
-#            !include-raw-escape: 'build-discovery-docker-image.sh'
-#          build-node: ubuntu1804-docker-arm64-4c-2g
-#    project: 'msb/discovery'
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: 'msb-discovery-settings'
-#    files: '**'
-#    archive-artifacts: ''
-#
 - project:
-    name: msb-discovery-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: 'msb/discovery'
-    project-name: 'msb-discovery'
-    branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: msb-discovery-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: "msb/discovery"
+      project-name: "msb-discovery"
+      branch: "master"
+      mvn-settings: "msb-discovery-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: msb-discovery-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: msb/discovery
-    project-name: 'msb-discovery'
-    branch: 'master'
-    mvn-settings: 'msb-discovery-settings'
+      name: msb-discovery-clm
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: "onap-"
+      project: msb/discovery
+      project-name: "msb-discovery"
+      branch: "master"
+      mvn-settings: "msb-discovery-settings"
 
 - project:
-    name: msb-discovery-info
-    project-name: msb-discovery
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: msb/discovery
-    branch: master
+      name: msb-discovery-info
+      project-name: msb-discovery
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos8-builder-2c-1g
+      project: msb/discovery
+      branch: master
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index ccaeb328e..d793ec079 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -1,56 +1,56 @@
 ---
 - project:
-    name: msb-java-sdk
-    project-name: 'msb-java-sdk'
-    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: 'msb/java-sdk'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-java-sdk-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+      name: msb-java-sdk
+      project-name: "msb-java-sdk"
+      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: "msb/java-sdk"
+      stream:
+          - "master":
+                branch: "master"
+      mvn-settings: "msb-java-sdk-settings"
+      files: "**"
+      archive-artifacts: ""
+      build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: msb-java-sdk-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: 'msb/java-sdk'
-    project-name: 'msb-java-sdk'
-    branch: 'master'
-    mvn-settings: 'msb-java-sdk-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: msb-java-sdk-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: "msb/java-sdk"
+      project-name: "msb-java-sdk"
+      branch: "master"
+      mvn-settings: "msb-java-sdk-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: msb-java-sdk-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: msb/java-sdk
-    project-name: 'msb-java-sdk'
-    branch: 'master'
-    mvn-settings: 'msb-java-sdk-settings'
+      name: msb-java-sdk-clm
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: "onap-"
+      project: msb/java-sdk
+      project-name: "msb-java-sdk"
+      branch: "master"
+      mvn-settings: "msb-java-sdk-settings"
 
 - project:
-    name: msb-java-sdk-info
-    project-name: msb-java-sdk
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: msb/java-sdk
-    branch: master
+      name: msb-java-sdk-info
+      project-name: msb-java-sdk
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos8-builder-2c-1g
+      project: msb/java-sdk
+      branch: master
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 4217d21fa..7aaa31052 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -1,56 +1,56 @@
 ---
 - project:
-    name: msb-swagger-sdk
-    project-name: 'msb-swagger-sdk'
-    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: 'msb/swagger-sdk'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'msb-swagger-sdk-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+      name: msb-swagger-sdk
+      project-name: "msb-swagger-sdk"
+      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: "msb/swagger-sdk"
+      stream:
+          - "master":
+                branch: "master"
+      mvn-settings: "msb-swagger-sdk-settings"
+      files: "**"
+      archive-artifacts: ""
+      build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: msb-swagger-sdk-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: 'msb/swagger-sdk'
-    project-name: 'msb-swagger-sdk'
-    branch: 'master'
-    mvn-settings: 'msb-swagger-sdk-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+      name: msb-swagger-sdk-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: "msb/swagger-sdk"
+      project-name: "msb-swagger-sdk"
+      branch: "master"
+      mvn-settings: "msb-swagger-sdk-settings"
+      mvn-goals: "clean install"
+      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-    name: msb-swagger-sdk-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: msb/swagger-sdk
-    project-name: 'msb-swagger-sdk'
-    branch: 'master'
-    mvn-settings: 'msb-swagger-sdk-settings'
+      name: msb-swagger-sdk-clm
+      jobs:
+          - gerrit-maven-clm
+      nexus-iq-namespace: "onap-"
+      project: msb/swagger-sdk
+      project-name: "msb-swagger-sdk"
+      branch: "master"
+      mvn-settings: "msb-swagger-sdk-settings"
 
 - project:
-    name: msb-swagger-sdk-info
-    project-name: msb-swagger-sdk
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: msb/swagger-sdk
-    branch: master
+      name: msb-swagger-sdk-info
+      project-name: msb-swagger-sdk
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos8-builder-2c-1g
+      project: msb/swagger-sdk
+      branch: master