Refactor: Cleanup for pre-commit

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

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 36a8f09..35b8852 100644 (file)
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -7,73 +7,73 @@
 
 - project:
     name: dmaap-buscontroller-java
-    project-name: 'dmaap-buscontroller'
+    project-name: "dmaap-buscontroller"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package -P docker docker:build docker:push -DskipTests=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
+          mvn-goals: "clean package -P docker docker:build docker:push -DskipTests=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dmaap/buscontroller'
+    project: "dmaap/buscontroller"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dmaap-buscontroller-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dmaap-buscontroller-settings"
+    files: "**"
+    archive-artifacts: ""
     java-version: openjdk11
 
 - project:
     name: dmaap-buscontroller-csit
     jobs:
-      - '{project-name}-review-verification-maven-{stream}':
-            mvn-goals: clean install
-            mvn-params: '-P docker -DskipTests=true'
-      - '{project-name}-merge-verification-maven-{stream}':
-            mvn-goals: clean install
-            mvn-params: '-P docker -DskipTests=true'
-    project-name: 'dmaap-buscontroller'
-    recipients: 'fiachra.corcoran@est.tech'
-    project: 'dmaap/buscontroller'
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-P docker -DskipTests=true"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-P docker -DskipTests=true"
+    project-name: "dmaap-buscontroller"
+    recipients: "fiachra.corcoran@est.tech"
+    project: "dmaap/buscontroller"
     stream:
-      - 'master':
-            branch: 'master'
-    mvn-settings: 'dmaap-buscontroller-settings'
-    robot-options: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-buscontroller-settings"
+    robot-options: ""
 
 - project:
     name: dmaap-buscontroller-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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dmaap/buscontroller'
-    project-name: 'dmaap-buscontroller'
-    branch: 'master'
-    mvn-settings: 'dmaap-buscontroller-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dmaap/buscontroller"
+    project-name: "dmaap-buscontroller"
+    branch: "master"
+    mvn-settings: "dmaap-buscontroller-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: dmaap-buscontroller-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dmaap/buscontroller
-    project-name: 'dmaap-buscontroller'
-    branch: 'master'
-    mvn-settings: 'dmaap-buscontroller-settings'
+    project-name: "dmaap-buscontroller"
+    branch: "master"
+    mvn-settings: "dmaap-buscontroller-settings"
     java-version: openjdk11
 
 - project:

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 5e4de1c..304e040 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,74 +1,74 @@
 ---
 - project:
     name: dmaap-datarouter-java
-    project-name: 'dmaap-datarouter'
+    project-name: "dmaap-datarouter"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-goals: 'clean package -P docker docker:build docker:push'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
+          mvn-goals: "clean package -P docker docker:build docker:push"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dmaap/datarouter'
+    project: "dmaap/datarouter"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dmaap-datarouter-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dmaap-datarouter-settings"
+    files: "**"
+    archive-artifacts: ""
     java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-csit-ssl
     jobs:
-      - '{project-name}-review-verification-maven-{stream}':
-            mvn-goals: clean package
-            mvn-params: '-P docker docker:build -DskipTests=false'
-      - '{project-name}-merge-verification-maven-{stream}':
-            mvn-goals: clean package
-            mvn-params: '-P docker docker:build'
-    project-name: 'dmaap-datarouter'
-    recipients: 'fiachra.corcoran@est.tech'
-    project: 'dmaap/datarouter'
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean package
+          mvn-params: "-P docker docker:build -DskipTests=false"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean package
+          mvn-params: "-P docker docker:build"
+    project-name: "dmaap-datarouter"
+    recipients: "fiachra.corcoran@est.tech"
+    project: "dmaap/datarouter"
     stream:
-      - 'master':
-            branch: 'master'
-    mvn-settings: 'dmaap-datarouter-settings'
-    robot-options: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-datarouter-settings"
+    robot-options: ""
 
 - project:
     name: dmaap-datarouter-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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dmaap/datarouter'
-    project-name: 'dmaap-datarouter'
-    branch: 'master'
-    mvn-settings: 'dmaap-datarouter-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dmaap/datarouter"
+    project-name: "dmaap-datarouter"
+    branch: "master"
+    mvn-settings: "dmaap-datarouter-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dmaap/datarouter
-    project-name: 'dmaap-datarouter'
-    branch: 'master'
-    mvn-settings: 'dmaap-datarouter-settings'
+    project-name: "dmaap-datarouter"
+    branch: "master"
+    mvn-settings: "dmaap-datarouter-settings"
     java-version: openjdk11
 
 - project:

diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml
index 9700250..bc7a578 100644 (file)
--- a/jjb/dmaap/dmaap-kafka-client.yaml
+++ b/jjb/dmaap/dmaap-kafka-client.yaml
@@ -1,24 +1,24 @@
 ---
 - project:
     name: dmaap-kafka-client
-    project-name: 'dmaap-kafka-client'
+    project-name: "dmaap-kafka-client"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dmaap/kafka11aaf'
+    project: "dmaap/kafka11aaf"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-kafka11aaf-settings"
+    files: "**"
+    archive-artifacts: ""
     java-version: openjdk11
 
 - project:
@@ -26,27 +26,27 @@
     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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dmaap/kafka11aaf'
-    project-name: 'dmaap-kafka-client'
-    branch: 'master'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dmaap/kafka11aaf"
+    project-name: "dmaap-kafka-client"
+    branch: "master"
+    mvn-settings: "dmaap-kafka11aaf-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: dmaap-kafka-client-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'dmaap/kafka11aaf'
-    project-name: 'dmaap-kafka-client'
-    branch: 'master'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
+    nexus-iq-namespace: "onap-"
+    project: "dmaap/kafka11aaf"
+    project-name: "dmaap-kafka-client"
+    branch: "master"
+    mvn-settings: "dmaap-kafka11aaf-settings"
     java-version: openjdk11
 
 - project:

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index e1965b8..47dff2f 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -1,26 +1,26 @@
 ---
 - project:
     name: dmaap-messagerouter-dmaapclient-java
-    project-name: 'dmaap-messagerouter-dmaapclient-java'
+    project-name: "dmaap-messagerouter-dmaapclient-java"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dmaap/messagerouter/dmaapclient'
+    project: "dmaap/messagerouter/dmaapclient"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
+    files: "**"
+    archive-artifacts: ""
     java-version: openjdk11
 
 - project:
@@ -28,27 +28,27 @@
     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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dmaap/messagerouter/dmaapclient'
-    project-name: 'dmaap-messagerouter-dmaapclient'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dmaap/messagerouter/dmaapclient"
+    project-name: "dmaap-messagerouter-dmaapclient"
+    branch: "master"
+    mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-dmaapclient-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dmaap/messagerouter/dmaapclient
-    project-name: 'dmaap-messagerouter-dmaapclient'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+    project-name: "dmaap-messagerouter-dmaapclient"
+    branch: "master"
+    mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
     java-version: openjdk11
 
 - project:

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 15780a7..c700779 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,78 +1,78 @@
 ---
 - project:
     name: dmaap-messagerouter-messageservice-java
-    project-name: 'dmaap-messagerouter-messageservice-java'
+    project-name: "dmaap-messagerouter-messageservice-java"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-params: '-P docker -Dmaven.test.skip=true'
+          mvn-params: "-P docker -Dmaven.test.skip=true"
           maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    project: 'dmaap/messagerouter/messageservice'
+    project: "dmaap/messagerouter/messageservice"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
+    mvn-profile: "docker"
 
 - project:
     name: dmaap-csit
     jobs:
-      - '{project-name}-review-verification-maven-{stream}':
-            mvn-goals: clean deploy
-            mvn-params: '-P docker -Dskip.deploy=true -Dskip.docker.push=true'
-      - '{project-name}-merge-verification-maven-{stream}':
-            mvn-goals: clean deploy
-            mvn-params: '-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true'
-    project-name: 'dmaap-messagerouter-messageservice'
-    project: 'dmaap/messagerouter/messageservice'
-    recipients: 'fiachra.corcoran@est.tech'
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean deploy
+          mvn-params: "-P docker -Dskip.deploy=true -Dskip.docker.push=true"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean deploy
+          mvn-params: "-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true"
+    project-name: "dmaap-messagerouter-messageservice"
+    project: "dmaap/messagerouter/messageservice"
+    recipients: "fiachra.corcoran@est.tech"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    robot-options: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
+    robot-options: ""
 
 - project:
     name: dmaap-messagerouter-messageservice-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}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dmaap/messagerouter/messageservice'
-    project-name: 'dmaap-messagerouter-messageservice'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dmaap/messagerouter/messageservice"
+    project-name: "dmaap-messagerouter-messageservice"
+    branch: "master"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-messageservice-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dmaap/messagerouter/messageservice
-    project-name: 'dmaap-messagerouter-messageservice'
+    project-name: "dmaap-messagerouter-messageservice"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
     java-version: openjdk11
 
 - project: