Refactor: Cleanup for pre-commit

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

16 files changed, 276 insertions, 289 deletions

diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
index 674e71a89..8f1247775 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml
@@ -2,13 +2,13 @@
 - project:
     name: vfc-gvnfm-vnflcm-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnflcm'
-    recipients: 'dengyuanhong@chinamobile.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "vfc-gvnfm-vnflcm"
+    recipients: "dengyuanhong@chinamobile.com"
+    stream: "master"
     functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
+      - "sanity-check":
+          trigger_jobs: "vfc-gvnfm-vnflcm-master-docker-java-version-shell-daily"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
index 9236810d9..961289dec 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml
@@ -7,34 +7,33 @@
 
 - project:
     name: vfc-gvnfm-vnflcm-java
-    project-name: 'vfc-gvnfm-vnflcm'
-    project: 'vfc/gvnfm/vnflcm'
+    project-name: "vfc-gvnfm-vnflcm"
+    project: "vfc/gvnfm/vnflcm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-gvnfm-vnflcm-settings"
     subproject:
-      - 'lcm':
-          pom: 'lcm/pom.xml'
-          pattern: 'lcm/**'
+      - "lcm":
+          pom: "lcm/pom.xml"
+          pattern: "lcm/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - "{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-versions-plugin: true
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-vnflcm-docker-image.sh'
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-gvnfm-vnflcm-docker-image.sh"
           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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-redis-4c-4g
 
 - project:
@@ -42,29 +41,29 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
-    mvn-params: '-f lcm/pom.xml'
+    cron: "@daily"
+    mvn-params: "-f lcm/pom.xml"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vfc/gvnfm/vnflcm'
-    project-name: 'vfc-gvnfm-vnflcm-lcm'
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vfc/gvnfm/vnflcm"
+    project-name: "vfc-gvnfm-vnflcm-lcm"
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnflcm-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-gvnfm-vnflcm-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vfc/gvnfm/vnflcm
-    project-name: 'vfc-gvnfm-vnflcm'
+    project-name: "vfc-gvnfm-vnflcm"
     build-node: centos8-redis-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnflcm-settings"
 
 - project:
     name: vfc-gvnfm-vnflcm-info
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
index 797e0a0d6..d58c6484b 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
@@ -1,17 +1,16 @@
 ---
-
 - project:
     name: vfc-gvnfm-vnflcm
-    project-name: 'vfc-gvnfm-vnflcm'
-    project: 'vfc/gvnfm/vnflcm'
+    project-name: "vfc-gvnfm-vnflcm"
+    project: "vfc/gvnfm/vnflcm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnflcm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-gvnfm-vnflcm-settings"
     build-node: ubuntu1804-builder-4c-4g
     subproject:
-      - 'lcm':
-          path: 'lcm'
-          pattern: 'lcm/**'
+      - "lcm":
+          path: "lcm"
+          pattern: "lcm/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 9d4731568..3a892a931 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -1,34 +1,33 @@
 ---
 - project:
     name: vfc-gvnfm-vnfmgr-java
-    project-name: 'vfc-gvnfm-vnfmgr'
-    project: 'vfc/gvnfm/vnfmgr'
+    project-name: "vfc-gvnfm-vnfmgr"
+    project: "vfc/gvnfm/vnfmgr"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfmgr-settings"
     subproject:
-      - 'mgr':
-          pom: 'mgr/pom.xml'
-          pattern: 'mgr/**'
+      - "mgr":
+          pom: "mgr/pom.xml"
+          pattern: "mgr/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - "{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-versions-plugin: true
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-vnfmgr-docker-image.sh'
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-gvnfm-vnfmgr-docker-image.sh"
           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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -36,29 +35,29 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
-    mvn-params: '-f mgr/pom.xml'
+    cron: "@daily"
+    mvn-params: "-f mgr/pom.xml"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vfc/gvnfm/vnfmgr'
-    project-name: 'vfc-gvnfm-vnfmgr-mgr'
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vfc/gvnfm/vnfmgr"
+    project-name: "vfc-gvnfm-vnfmgr-mgr"
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfmgr-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-gvnfm-vnfmgr-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vfc/gvnfm/vnfmgr
-    project-name: 'vfc-gvnfm-vnfmgr'
+    project-name: "vfc-gvnfm-vnfmgr"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfmgr-settings"
 
 - project:
     name: vfc-gvnfm-vnfmgr-info
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
index 2bb891beb..7f8f3c787 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-python.yaml
@@ -1,17 +1,16 @@
 ---
-
 - project:
     name: vfc-gvnfm-vnfmgr
-    project-name: 'vfc-gvnfm-vnfmgr'
-    project: 'vfc/gvnfm/vnfmgr'
+    project-name: "vfc-gvnfm-vnfmgr"
+    project: "vfc/gvnfm/vnfmgr"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfmgr-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfmgr-settings"
     build-node: ubuntu1804-builder-4c-4g
     subproject:
-      - 'mgr':
-          path: 'mgr'
-          pattern: 'mgr/**'
+      - "mgr":
+          path: "mgr"
+          pattern: "mgr/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
index cd4b848ac..57980bfa8 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml
@@ -2,13 +2,13 @@
 - project:
     name: vfc-gvnfm-vnfres-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-gvnfm-vnfres'
-    recipients: 'dengyuanhong@chinamobile.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "vfc-gvnfm-vnfres"
+    recipients: "dengyuanhong@chinamobile.com"
+    stream: "master"
     functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-gvnfm-vnfres-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
+      - "sanity-check":
+          trigger_jobs: "vfc-gvnfm-vnfres-master-docker-java-version-shell-daily"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index c5ab06a95..4c594578f 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -1,35 +1,33 @@
 ---
-
 - project:
     name: vfc-gvnfm-vnfres-java
-    project-name: 'vfc-gvnfm-vnfres'
-    project: 'vfc/gvnfm/vnfres'
+    project-name: "vfc-gvnfm-vnfres"
+    project: "vfc/gvnfm/vnfres"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfres-settings"
     subproject:
-      - 'res':
-          pom: 'res/pom.xml'
-          pattern: 'res/**'
+      - "res":
+          pom: "res/pom.xml"
+          pattern: "res/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - "{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-versions-plugin: true
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-vnfres-docker-image.sh'
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-gvnfm-vnfres-docker-image.sh"
           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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -37,29 +35,29 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
-    mvn-params: '-f res/pom.xml'
+    cron: "@daily"
+    mvn-params: "-f res/pom.xml"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vfc/gvnfm/vnfres'
-    project-name: 'vfc-gvnfm-vnfres-res'
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfres-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vfc/gvnfm/vnfres"
+    project-name: "vfc-gvnfm-vnfres-res"
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfres-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-gvnfm-vnfres-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vfc/gvnfm/vnfres
-    project-name: 'vfc-gvnfm-vnfres'
+    project-name: "vfc-gvnfm-vnfres"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+    branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfres-settings"
 
 - project:
     name: vfc-gvnfm-vnfres-info
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
index 5bdf8e411..9040de994 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-python.yaml
@@ -1,17 +1,16 @@
 ---
-
 - project:
     name: vfc-gvnfm-vnfres
-    project-name: 'vfc-gvnfm-vnfres'
-    project: 'vfc/gvnfm/vnfres'
+    project-name: "vfc-gvnfm-vnfres"
+    project: "vfc/gvnfm/vnfres"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-gvnfm-vnfres-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-gvnfm-vnfres-settings"
     build-node: ubuntu1804-builder-4c-4g
     subproject:
-      - 'res':
-          path: 'res'
-          pattern: 'res/**'
+      - "res":
+          path: "res"
+          pattern: "res/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml
index 834293a10..d06c90d4f 100644
--- a/jjb/vfc/vfc-nfvo-db.yaml
+++ b/jjb/vfc/vfc-nfvo-db.yaml
@@ -1,31 +1,29 @@
 ---
 - project:
     name: vfc-nfvo-db
-    project: 'vfc/nfvo/db'
-    project-name: 'vfc-nfvo-db'
-    mvn-settings: 'vfc-nfvo-db-settings'
+    project: "vfc/nfvo/db"
+    project-name: "vfc-nfvo-db"
+    mvn-settings: "vfc-nfvo-db-settings"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     build-node: ubuntu1804-builder-4c-4g
     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-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-db-docker-image.sh'
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-nfvo-db-docker-image.sh"
           build-node: ubuntu1804-docker-8c-8g
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-
 - project:
     name: vfc-nfvo-db-info
     project-name: vfc-nfvo-db
diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
index 06a4b3527..259ab141e 100644
--- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml
@@ -1,31 +1,31 @@
 ---
 - project:
     name: vfc-nfvo-driver-svnfm-huawei
-    project-name: 'vfc-nfvo-driver-svnfm-huawei'
+    project-name: "vfc-nfvo-driver-svnfm-huawei"
     java-version: openjdk11
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
+    project: "vfc/nfvo/driver/vnfm/svnfm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
     subproject:
-      - 'drv-vnfm-huawei':
-          pom: 'huawei/pom.xml'
-          pattern: 'huawei/**'
+      - "drv-vnfm-huawei":
+          pom: "huawei/pom.xml"
+          pattern: "huawei/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - "{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-versions-plugin: true
-          mvn-pom: 'huawei/pom.xml'
-          mvn-params: '-f huawei/pom.xml'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-pom: "huawei/pom.xml"
+          mvn-params: "-f huawei/pom.xml"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -34,31 +34,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    mvn-params: '-f huawei/pom.xml'
-    project: 'vfc/nfvo/driver/vnfm/svnfm'
-    project-name: 'vfc-nfvo-driver-svnfm-huawei'
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-params: "-f huawei/pom.xml"
+    project: "vfc/nfvo/driver/vnfm/svnfm"
+    project-name: "vfc-nfvo-driver-svnfm-huawei"
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-clm
     java-version: openjdk11
     jobs:
       - gerrit-maven-clm:
-          mvn-params: '-f huawei/pom.xml'
-    nexus-iq-namespace: 'onap-'
+          mvn-params: "-f huawei/pom.xml"
+    nexus-iq-namespace: "onap-"
     project: vfc/nfvo/driver/vnfm/svnfm
-    project-name: 'vfc-nfvo-driver-svnfm-huawei'
+    project-name: "vfc-nfvo-driver-svnfm-huawei"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings'
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings"
 
 - project:
     name: vfc-nfvo-driver-svnfm-huawei-info
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
index 52515da39..40ed27614 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-csit.yaml
@@ -2,13 +2,13 @@
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
-    recipients: 'dengyuanhong@chinamobile.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm"
+    recipients: "dengyuanhong@chinamobile.com"
+    stream: "master"
     functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
+      - "sanity-check":
+          trigger_jobs: "vfc-nfvo-driver-vnfm-gvnfm-master-docker-java-version-shell-daily"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
index ed79326ad..4c9dba91e 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml
@@ -1,37 +1,35 @@
 ---
-
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-java
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
-    project: 'vfc/nfvo/driver/vnfm/gvnfm'
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm"
+    project: "vfc/nfvo/driver/vnfm/gvnfm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
     subproject:
-      - 'gvnfmadapter':
-          pom: 'gvnfmadapter/pom.xml'
-          pattern: 'gvnfmadapter/**'
+      - "gvnfmadapter":
+          pom: "gvnfmadapter/pom.xml"
+          pattern: "gvnfmadapter/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java'
+      - "{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-versions-plugin: true
-          mvn-pom: 'gvnfmadapter/pom.xml'
-          mvn-params: '-f gvnfmadapter/pom.xml'
-      - '{project-name}-{stream}-docker-java-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-gvnfm-driver-docker-image.sh'
+          mvn-pom: "gvnfmadapter/pom.xml"
+          mvn-params: "-f gvnfmadapter/pom.xml"
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-gvnfm-driver-docker-image.sh"
           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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -39,29 +37,29 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
-    mvn-params: '-f gvnfmadapter/pom.xml'
+    cron: "@daily"
+    mvn-params: "-f gvnfmadapter/pom.xml"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vfc/nfvo/driver/vnfm/gvnfm'
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter'
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vfc/nfvo/driver/vnfm/gvnfm"
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm-gvnfmadapter"
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vfc/nfvo/driver/vnfm/gvnfm
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm"
     build-node: ubuntu1804-builder-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+    branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
 
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-info
diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
index 0cad04b23..c07095b16 100644
--- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-python.yaml
@@ -1,17 +1,16 @@
 ---
-
 - project:
     name: vfc-nfvo-driver-vnfm-gvnfm-python
-    project-name: 'vfc-nfvo-driver-vnfm-gvnfm'
-    project: 'vfc/nfvo/driver/vnfm/gvnfm'
+    project-name: "vfc-nfvo-driver-vnfm-gvnfm"
+    project: "vfc/nfvo/driver/vnfm/gvnfm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings"
     build-node: ubuntu1804-builder-4c-4g
     subproject:
-      - 'gvnfmadapter':
-          path: 'gvnfmadapter'
-          pattern: 'gvnfmadapter/**'
+      - "gvnfmadapter":
+          path: "gvnfmadapter"
+          pattern: "gvnfmadapter/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"
diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
index 1a03d5d88..1decb6616 100644
--- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml
@@ -2,13 +2,13 @@
 - project:
     name: vfc-nfvo-lcm-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'vfc-nfvo-lcm'
-    recipients: 'dengyuanhong@chinamobile.com'
-    stream: 'master'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "vfc-nfvo-lcm"
+    recipients: "dengyuanhong@chinamobile.com"
+    stream: "master"
     functionality:
-      - 'sanity-check':
-          trigger_jobs: 'vfc-nfvo-lcm-master-docker-java-version-shell-daily'
-    robot-options: ''
-    branch: 'master'
+      - "sanity-check":
+          trigger_jobs: "vfc-nfvo-lcm-master-docker-java-version-shell-daily"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml
index 884be7a85..fb2a0534c 100644
--- a/jjb/vfc/vfc-nfvo-lcm-java.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml
@@ -1,30 +1,29 @@
 ---
 - project:
     name: vfc-nfvo-lcm-java
-    project-name: 'vfc-nfvo-lcm'
-    project: 'vfc/nfvo/lcm'
+    project-name: "vfc-nfvo-lcm"
+    project: "vfc/nfvo/lcm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-lcm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-nfvo-lcm-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-version-shell-daily':
-          docker-pom: 'pom.xml'
-          mvn-goals: 'install'
-          script:
-            !include-raw-escape: 'build-nfvo-lcm-docker-image.sh'
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-nfvo-lcm-docker-image.sh"
           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: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: centos8-redis-4c-4g
 
 - project:
@@ -32,28 +31,28 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
     sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar"
-    cron: '@daily'
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'vfc/nfvo/lcm'
-    project-name: 'vfc-nfvo-lcm'
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-lcm-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "vfc/nfvo/lcm"
+    project-name: "vfc-nfvo-lcm"
+    branch: "master"
+    mvn-settings: "vfc-nfvo-lcm-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: vfc-nfvo-lcm-java-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: vfc/nfvo/lcm
-    project-name: 'vfc-nfvo-lcm'
+    project-name: "vfc-nfvo-lcm"
     build-node: centos8-redis-4c-4g
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-lcm-settings'
+    branch: "master"
+    mvn-settings: "vfc-nfvo-lcm-settings"
 
 - project:
     name: vfc-nfvo-lcm-info
diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml
index 19791ef28..7c5594411 100644
--- a/jjb/vfc/vfc-nfvo-lcm-python.yaml
+++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml
@@ -1,16 +1,16 @@
 ---
 - project:
     name: vfc-nfvo-lcm
-    project-name: 'vfc-nfvo-lcm'
-    project: 'vfc/nfvo/lcm'
+    project-name: "vfc-nfvo-lcm"
+    project: "vfc/nfvo/lcm"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'vfc-nfvo-lcm-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "vfc-nfvo-lcm-settings"
     build-node: ubuntu1804-builder-4c-4g
     subproject:
-      - 'lcm':
-          path: '.'
-          pattern: '**'
+      - "lcm":
+          path: "."
+          pattern: "**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"