Refactor: Cleanup for pre-commit

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

diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml
index edf34bb..0c46a4b 100644 (file)
--- a/jjb/usecases/usecases-csit.yaml
+++ b/jjb/usecases/usecases-csit.yaml
@@ -2,30 +2,30 @@
 - project:
     name: usecases-pnf-sw-upgrade
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases-pnf-sw-upgrade'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "usecases-pnf-sw-upgrade"
+    recipients: "morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'pnf-sw-upgrade':
+      - "pnf-sw-upgrade":
           trigger_jobs:
-    robot-options: ''
-    disabled: 'true'
+    robot-options: ""
+    disabled: "true"
 
 - project:
     name: usecases-config-over-netconf
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'usecases-config-over-netconf'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "usecases-config-over-netconf"
+    recipients: "morgan.richomm@orange.com bf1936@att.com rahul.tyagi@est.tech"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'config-over-netconf':
+      - "config-over-netconf":
           trigger_jobs:
-    robot-options: ''
+    robot-options: ""

diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
index 87482ee..cb5bf82 100644 (file)
--- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml
+++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml
@@ -1,18 +1,17 @@
 ---
-
 - project:
     name: usecase-ui-intent-analysis
-    project-name: 'usecase-ui-intent-analysis'
-    project: 'usecase-ui/intent-analysis'
+    project-name: "usecase-ui-intent-analysis"
+    project: "usecase-ui/intent-analysis"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'usecase-ui-intent-analysis-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "usecase-ui-intent-analysis-settings"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
@@ -21,15 +20,15 @@
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          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
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -37,31 +36,31 @@
     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'
+    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: 'usecase-ui/intent-analysis'
-    project-name: 'usecase-ui-intent-analysis'
-    branch: 'master'
-    mvn-settings: 'usecase-ui-intent-analysis-settings'
+    project: "usecase-ui/intent-analysis"
+    project-name: "usecase-ui-intent-analysis"
+    branch: "master"
+    mvn-settings: "usecase-ui-intent-analysis-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: usecase-ui-intent-analysis-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: usecase-ui/intent-analysis
-    project-name: 'usecase-ui-intent-analysis'
+    project-name: "usecase-ui-intent-analysis"
     build-node: ubuntu1804-builder-4c-4g
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'usecase-ui-intent-analysis-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "usecase-ui-intent-analysis-settings"
     java-version: openjdk11
 
 - project:

diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml
index 1375d1a..a255cce 100644 (file)
--- a/jjb/usecaseui/usecase-ui-nlp.yaml
+++ b/jjb/usecaseui/usecase-ui-nlp.yaml
@@ -1,31 +1,30 @@
 ---
-
 - project:
     name: usecase-ui-nlp
-    project-name: 'usecase-ui-nlp'
-    project: 'usecase-ui/nlp'
+    project-name: "usecase-ui-nlp"
+    project: "usecase-ui/nlp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'usecase-ui-nlp-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "usecase-ui-nlp-settings"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{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-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - "{project-name}-{stream}-docker-java-daily":
+          mvn-params: "-Dmaven.test.skip=true"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
 
@@ -34,28 +33,28 @@
     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'
+    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: 'usecase-ui/nlp'
-    project-name: 'usecase-ui-nlp'
-    branch: 'master'
-    mvn-settings: 'usecase-ui-nlp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "usecase-ui/nlp"
+    project-name: "usecase-ui-nlp"
+    branch: "master"
+    mvn-settings: "usecase-ui-nlp-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: usecase-ui-nlp-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: usecase-ui/nlp
-    project-name: 'usecase-ui-nlp'
+    project-name: "usecase-ui-nlp"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'usecase-ui-nlp-settings'
+    branch: "master"
+    mvn-settings: "usecase-ui-nlp-settings"
 
 - project:
     name: usecase-ui-nlp-info

diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml
index c30253a..7115be4 100644 (file)
--- a/jjb/usecaseui/usecase-ui-server.yaml
+++ b/jjb/usecaseui/usecase-ui-server.yaml
@@ -1,31 +1,30 @@
 ---
-
 - project:
     name: usecase-ui-server
-    project-name: 'usecase-ui-server'
-    project: 'usecase-ui/server'
+    project-name: "usecase-ui-server"
+    project: "usecase-ui/server"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'usecase-ui-server-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "usecase-ui-server-settings"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{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-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - "{project-name}-{stream}-docker-java-daily":
+          mvn-params: "-Dmaven.test.skip=true"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
 
@@ -34,28 +33,28 @@
     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'
+    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: 'usecase-ui/server'
-    project-name: 'usecase-ui-server'
-    branch: 'master'
-    mvn-settings: 'usecase-ui-server-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "usecase-ui/server"
+    project-name: "usecase-ui-server"
+    branch: "master"
+    mvn-settings: "usecase-ui-server-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: usecase-ui-server-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: usecase-ui/server
-    project-name: 'usecase-ui-server'
+    project-name: "usecase-ui-server"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'usecase-ui-server-settings'
+    branch: "master"
+    mvn-settings: "usecase-ui-server-settings"
 
 - project:
     name: usecase-ui-server-info

diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml
index 45f939f..a447220 100644 (file)
--- a/jjb/usecaseui/usecase-ui.yaml
+++ b/jjb/usecaseui/usecase-ui.yaml
@@ -7,30 +7,30 @@
 
 - project:
     name: usecase-ui
-    project-name: 'usecase-ui'
-    project: 'usecase-ui'
+    project-name: "usecase-ui"
+    project: "usecase-ui"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'usecase-ui-settings'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "usecase-ui-settings"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{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-name}-{stream}-docker-java-daily':
-          mvn-params: '-Dmaven.test.skip=true'
+      - "{project-name}-{stream}-docker-java-daily":
+          mvn-params: "-Dmaven.test.skip=true"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
     mvn-profile: docker
     build-node: ubuntu1804-builder-4c-4g
 
@@ -38,12 +38,12 @@
     name: usecase-ui-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: usecase-ui
-    project-name: 'usecase-ui'
+    project-name: "usecase-ui"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'usecase-ui-settings'
+    branch: "master"
+    mvn-settings: "usecase-ui-settings"
 
 - project:
     name: usecase-ui-info