Refactor: Cleanup for pre-commit

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

3 files changed, 58 insertions, 85 deletions

diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml
deleted file mode 100644
index 314c2c47d..000000000
--- a/jjb/music/music-distributed-kv-store-csit.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Integration templates no longer support these
-# job definitions; if Music CSIT needs to be restored,
-# '{project-name}-review-verification-golang-{stream}'
-# '{project-name}-merge-verification-golag-{stream}'
-# would have to be added to integration templates and
-# applied here
-#
-#---
-#- project:
-#    name: music-distributed-kv-store-csit
-#    jobs:
-#      - '{project-name}-{stream}-project-csit'
-#      - '{project-name}-review-verification-{stream}'
-#      - '{project-name}-merge-verification-{stream}'
-#    project-name: 'music-distributed-kv-store'
-#    project: 'music/distributed-kv-store'
-#    disabled: true
-#    stream: 'master'
-#    artifact-type: 'golang'
-#    java-version: openjdk11
-#    mvn-version: 'mvn36'
-#    mvn-settings: 'music-distributed-kv-store-settings'
-#    mvn-global-settings: global-settings
-#    robot-options: ''
-#    branch: 'master'
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index adf8b3a2c..576f459e9 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -1,29 +1,28 @@
 ---
 - project:
-    name: music-distributed-kv-store
-    project-name: 'music-distributed-kv-store'
-    path: 'src/dkv'
-    jobs:
-      - '{project-name}-{stream}-verify-golang'
-      - '{project-name}-{stream}-merge-golang'
-      - '{project-name}-{stream}-docker-golang-shell-daily':
-          script:
-            !include-raw-escape: 'build-music-distributed-kv-store-image.sh'
-    project: 'music/distributed-kv-store'
-    stream:
-      - 'master':
-          branch: 'master'
-    artifact-type: 'golang'
-    mvn-settings: 'music-distributed-kv-store-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
+      name: music-distributed-kv-store
+      project-name: "music-distributed-kv-store"
+      path: "src/dkv"
+      jobs:
+          - "{project-name}-{stream}-verify-golang"
+          - "{project-name}-{stream}-merge-golang"
+          - "{project-name}-{stream}-docker-golang-shell-daily":
+                script: !include-raw-escape: "build-music-distributed-kv-store-image.sh"
+      project: "music/distributed-kv-store"
+      stream:
+          - "master":
+                branch: "master"
+      artifact-type: "golang"
+      mvn-settings: "music-distributed-kv-store-settings"
+      files: "**"
+      archive-artifacts: ""
+      build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: music-distributed-kv-store-info
-    project-name: music-distributed-kv-store
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos8-builder-2c-1g
-    project: music/distributed-kv-store
-    branch: master
+      name: music-distributed-kv-store-info
+      project-name: music-distributed-kv-store
+      jobs:
+          - gerrit-info-yaml-verify
+      build-node: centos8-builder-2c-1g
+      project: music/distributed-kv-store
+      branch: master
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index c899e0afa..6a2bb3fd0 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -1,39 +1,38 @@
 ---
 - project:
-    name: music-jar
-    project-name: 'music'
-    subproject:
-      - 'music-jar':
-          pom: 'jar/pom.xml'
-          pattern: 'jar/**'
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
-      - gerrit-maven-stage:
-          sbom-generator: true
-          sign-artifacts: true
-          build-node: centos8-docker-4c-4g
-          maven-version-plugin: true
-          mvn-pom: 'jar/pom.xml'
-          mvn-params: '-f jar/pom.xml'
-          pattern: 'jar/**'
-    project: 'music'
-    stream:
-      - 'jar-master':
-          branch: 'master'
-    mvn-settings: 'music-settings'
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
+      name: music-jar
+      project-name: "music"
+      subproject:
+          - "music-jar":
+                pom: "jar/pom.xml"
+                pattern: "jar/**"
+      jobs:
+          - "{project-name}-{stream}-{subproject}-verify-java"
+          - "{project-name}-{stream}-{subproject}-merge-java"
+          - gerrit-maven-stage:
+                sbom-generator: true
+                sign-artifacts: true
+                build-node: centos8-docker-4c-4g
+                maven-version-plugin: true
+                mvn-pom: "jar/pom.xml"
+                mvn-params: "-f jar/pom.xml"
+                pattern: "jar/**"
+      project: "music"
+      stream:
+          - "jar-master":
+                branch: "master"
+      mvn-settings: "music-settings"
+      files: "**"
+      archive-artifacts: ""
+      build-node: ubuntu1804-builder-4c-4g
 
 - project:
-    name: music-jar-clm
-    jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f jar/pom.xml'
-    nexus-iq-namespace: 'onap-'
-    project: music
-    project-name: 'music-jar'
-    branch: 'master'
-    mvn-settings: 'music-settings'
+      name: music-jar-clm
+      jobs:
+          - gerrit-maven-clm:
+                mvn-params: "-f jar/pom.xml"
+      nexus-iq-namespace: "onap-"
+      project: music
+      project-name: "music-jar"
+      branch: "master"
+      mvn-settings: "music-settings"