Refactor: Cleanup for pre-commit

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

30 files changed, 1297 insertions, 1303 deletions

diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index c75c9abd6..3a326485e 100644
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -9,64 +9,64 @@
     branch: master
 
 - project:
-      name: integration-docker-onap-java-linters
-      project: integration/docker/onap-java11
-      project-name: integration-docker-onap-java
-      python-version: python3
-      jobs:
-          - integration-linters
-      subproject:
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'json':
-                tox-dir: '.'
-                tox-envs: 'json'
-                pattern: '**/*.json'
-          - 'md':
-              tox-dir: '.'
-              tox-envs: 'md'
-              pattern: '**/*.md'
-      stream:
-          - 'master':
-                branch: 'master'
+    name: integration-docker-onap-java-linters
+    project: integration/docker/onap-java11
+    project-name: integration-docker-onap-java
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+    stream:
+      - "master":
+          branch: "master"
 
 - project:
     name: integration-docker-onap-java-release
-    project-name: 'integration-docker-onap-java'
-    project: 'integration/docker/onap-java11'
-    mvn-settings: 'integration-settings'
+    project-name: "integration-docker-onap-java"
+    project: "integration/docker/onap-java11"
+    mvn-settings: "integration-settings"
     jobs:
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
 - project:
-    name: 'integration-docker-onap-java-docker'
+    name: "integration-docker-onap-java-docker"
     jobs:
       - gerrit-docker-verify:
-          project-name: 'integration-docker-onap-java11'
-          docker-name: 'onap/integration-java11'
+          project-name: "integration-docker-onap-java11"
+          docker-name: "onap/integration-java11"
       - gerrit-docker-merge:
-          project-name: 'integration-docker-onap-java11'
-          docker-name: 'onap/integration-java11'
+          project-name: "integration-docker-onap-java11"
+          docker-name: "onap/integration-java11"
       - gerrit-docker-verify:
-          project-name: 'integration-docker-onap-java17'
-          docker-name: 'onap/integration-java17'
-          docker-build-args: '--build-arg java_ver=onap-java17'
+          project-name: "integration-docker-onap-java17"
+          docker-name: "onap/integration-java17"
+          docker-build-args: "--build-arg java_ver=onap-java17"
       - gerrit-docker-merge:
-          project-name: 'integration-docker-onap-java17'
-          docker-name: 'onap/integration-java17'
-          docker-build-args: '--build-arg java_ver=onap-java17'
-    project: 'integration/docker/onap-java11'
+          project-name: "integration-docker-onap-java17"
+          docker-name: "onap/integration-java17"
+          docker-build-args: "--build-arg java_ver=onap-java17"
+    project: "integration/docker/onap-java11"
     stream:
-      - 'master':
-            branch: 'master'
-            files: ''
-    docker-root: '$WORKSPACE'
-    mvn-settings: 'integration-settings'
+      - "master":
+          branch: "master"
+          files: ""
+    docker-root: "$WORKSPACE"
+    mvn-settings: "integration-settings"
     build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml
index 64b059b04..dc7c2ffcb 100644
--- a/jjb/integration/docker/integration-docker-onap-python.yaml
+++ b/jjb/integration/docker/integration-docker-onap-python.yaml
@@ -9,55 +9,55 @@
     branch: master
 
 - project:
-      name: integration-docker-onap-python-linters
-      project: integration/docker/onap-python
-      project-name: integration-docker-onap-python
-      python-version: python3
-      jobs:
-          - integration-linters
-      subproject:
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'json':
-                tox-dir: '.'
-                tox-envs: 'json'
-                pattern: '**/*.json'
-          - 'md':
-              tox-dir: '.'
-              tox-envs: 'md'
-              pattern: '**/*.md'
-      stream:
-          - 'master':
-                branch: 'master'
+    name: integration-docker-onap-python-linters
+    project: integration/docker/onap-python
+    project-name: integration-docker-onap-python
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+    stream:
+      - "master":
+          branch: "master"
 
 - project:
     name: integration-docker-onap-python-release
-    project-name: 'integration-docker-onap-python'
-    project: 'integration/docker/onap-python'
-    mvn-settings: 'integration-settings'
+    project-name: "integration-docker-onap-python"
+    project: "integration/docker/onap-python"
+    mvn-settings: "integration-settings"
     jobs:
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
 - project:
-    name: 'integration-docker-onap-python-docker'
+    name: "integration-docker-onap-python-docker"
     jobs:
       - gerrit-docker-verify
       - gerrit-docker-merge
-    project-name: 'integration-docker-onap-python'
-    project: 'integration/docker/onap-python'
+    project-name: "integration-docker-onap-python"
+    project: "integration/docker/onap-python"
     stream:
-      - 'master':
-            branch: 'master'
-            files: ''
-    docker-name: 'onap/integration-python'
-    docker-build-args: '-f ./Dockerfile'
-    docker-root: '$WORKSPACE'
-    mvn-settings: 'integration-settings'
+      - "master":
+          branch: "master"
+          files: ""
+    docker-name: "onap/integration-python"
+    docker-build-args: "-f ./Dockerfile"
+    docker-root: "$WORKSPACE"
+    mvn-settings: "integration-settings"
     build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml
index b28ddb253..d401281f1 100644
--- a/jjb/integration/integration-csit.yaml
+++ b/jjb/integration/integration-csit.yaml
@@ -2,19 +2,19 @@
 - project:
     name: integration-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'integration'
-    recipients: 'morgan.richomm@orange.com bf1936@att.com'
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "integration"
+    recipients: "morgan.richomm@orange.com bf1936@att.com"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     functionality:
-      - 'functionality1':
+      - "functionality1":
           trigger_jobs:
-      - 'vCPE':
+      - "vCPE":
           trigger_jobs:
-    robot-options: ''
+    robot-options: ""
 
 - project:
     name: integration-csit-info
diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml
index 164eb7372..3c02f4e17 100644
--- a/jjb/integration/integration-data-provider.yaml
+++ b/jjb/integration/integration-data-provider.yaml
@@ -15,70 +15,70 @@
 
 - project:
     name: integration-data-provider-linters
-    project: 'integration/data-provider'
-    project-name: 'integration-data-provider'
+    project: "integration/data-provider"
+    project-name: "integration-data-provider"
     python-version: python3
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'rst':
-          tox-dir: '.'
-          tox-envs: 'rst'
-          pattern: '**/*.rst'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
-      - 'cov':
-          tox-dir: '.'
-          tox-envs: 'cov'
-          pattern: '**/*.py'
-      - 'mypy':
-          tox-dir: '.'
-          tox-envs: 'mypy'
-          pattern: '**/*.py'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+      - "rst":
+          tox-dir: "."
+          tox-envs: "rst"
+          pattern: "**/*.rst"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+      - "cov":
+          tox-dir: "."
+          tox-envs: "cov"
+          pattern: "**/*.py"
+      - "mypy":
+          tox-dir: "."
+          tox-envs: "mypy"
+          pattern: "**/*.py"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
 
 - project:
-    name: 'integration-data-provider-docker-verify'
+    name: "integration-data-provider-docker-verify"
     jobs:
       - gerrit-docker-verify
       - gerrit-docker-merge
-    project-name: 'integration-data-provider'
-    project: 'integration/data-provider'
+    project-name: "integration-data-provider"
+    project: "integration/data-provider"
     stream:
-      - 'master':
-            branch: 'master'
-            files: ''
-    docker-build-args: '-f ./Dockerfile'
-    docker-name: 'onap/data-provider'
-    docker-root: '$WORKSPACE'
-    mvn-settings: 'integration-settings'
+      - "master":
+          branch: "master"
+          files: ""
+    docker-build-args: "-f ./Dockerfile"
+    docker-name: "onap/data-provider"
+    docker-root: "$WORKSPACE"
+    mvn-settings: "integration-settings"
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
     name: integration-data-provider-release
-    project-name: 'integration-data-provider'
-    project: 'integration/data-provider'
-    mvn-settings: 'integration-settings'
+    project-name: "integration-data-provider"
+    project: "integration/data-provider"
+    mvn-settings: "integration-settings"
     jobs:
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
index c3a2ab972..2c02ed166 100644
--- a/jjb/integration/integration-docker-compose.yaml
+++ b/jjb/integration/integration-docker-compose.yaml
@@ -1,52 +1,52 @@
 ---
 - project:
     name: integration-docker-compose
-    project-name: 'integration'
-    project: 'integration'
+    project-name: "integration"
+    project: "integration"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     jobs:
       - integration-docker-compose-verify
     subproject:
-      - 'netconf-pnp-simulator':
-          pattern: 'test/mocks/netconf-pnp-simulator/modules/**'
-          docker_root: 'test/mocks/netconf-pnp-simulator/modules'
-          netconf_sim_service_name: 'netconf-pnp-simulator'
+      - "netconf-pnp-simulator":
+          pattern: "test/mocks/netconf-pnp-simulator/modules/**"
+          docker_root: "test/mocks/netconf-pnp-simulator/modules"
+          netconf_sim_service_name: "netconf-pnp-simulator"
           script: |
             #!/bin/bash
             cd $DOCKER_ROOT
             docker-compose up -d
           post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
-      - 'emssimulator-swm-netconf':
-          pattern: 'test/mocks/emssimulator/swm-netconf/**'
-          docker_root: 'test/mocks/emssimulator/swm-netconf'
-          netconf_sim_service_name: 'ems-netconf-swm'
+      - "emssimulator-swm-netconf":
+          pattern: "test/mocks/emssimulator/swm-netconf/**"
+          docker_root: "test/mocks/emssimulator/swm-netconf"
+          netconf_sim_service_name: "ems-netconf-swm"
           script: |
             #!/bin/bash
             cd $DOCKER_ROOT
             docker-compose up -d
           post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
-      - 'pmsh-pnf-sim':
-          pattern: 'test/mocks/pmsh-pnf-sim/docker-compose/**'
-          docker_root: 'test/mocks/pmsh-pnf-sim/docker-compose'
-          netconf_sim_service_name: 'netopeer2'
+      - "pmsh-pnf-sim":
+          pattern: "test/mocks/pmsh-pnf-sim/docker-compose/**"
+          docker_root: "test/mocks/pmsh-pnf-sim/docker-compose"
+          netconf_sim_service_name: "netopeer2"
           script: |
             #!/bin/bash
             cd $DOCKER_ROOT
             docker-compose up -d
           post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh
-      - 'datafilecollector-testharness':
-          pattern: 'test/mocks/datafilecollector-testharness/**'
-          docker_root: 'test/mocks/datafilecollector-testharness/simulator-group'
+      - "datafilecollector-testharness":
+          pattern: "test/mocks/datafilecollector-testharness/**"
+          docker_root: "test/mocks/datafilecollector-testharness/simulator-group"
           script: |
             #!/bin/bash
             cd $DOCKER_ROOT
             ./prepare-images.sh
             ./docker-compose-setup.sh
-      - 'prov-mns-provider':
-          pattern: 'test/mocks/prov-mns-provider/**'
-          docker_root: 'test/mocks/prov-mns-provider'
+      - "prov-mns-provider":
+          pattern: "test/mocks/prov-mns-provider/**"
+          docker_root: "test/mocks/prov-mns-provider"
           script: |
             #!/bin/bash
             cd $DOCKER_ROOT
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml
index 189d26bad..ef37ec78e 100644
--- a/jjb/integration/integration-docker.yaml
+++ b/jjb/integration/integration-docker.yaml
@@ -1,48 +1,48 @@
 ---
 - project:
     name: integration-docker
-    project-name: 'integration'
+    project-name: "integration"
     jobs:
       - integration-docker-merge
       - integration-docker-verify
-    project: 'integration'
+    project: "integration"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     subproject:
-      - 'aai-simulator':
-          pom: 'test/mocks/aai-simulator/pom.xml'
-          pattern: 'test/mocks/aai-simulator/**'
-          mvn-goals: 'mvn clean install -Dcheckstyle.skip'
-      - 'sniroemulator':
-          pom: 'test/mocks/sniroemulator/pom.xml'
-          pattern: 'test/mocks/sniroemulator/**'
-    mvn-settings: 'integration-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "aai-simulator":
+          pom: "test/mocks/aai-simulator/pom.xml"
+          pattern: "test/mocks/aai-simulator/**"
+          mvn-goals: "mvn clean install -Dcheckstyle.skip"
+      - "sniroemulator":
+          pom: "test/mocks/sniroemulator/pom.xml"
+          pattern: "test/mocks/sniroemulator/**"
+    mvn-settings: "integration-settings"
+    files: "**"
+    archive-artifacts: ""
 
 - project:
     name: integration-netconf-pnp-simulator
     project: integration
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     # Required by verifier
-    mvn-settings: 'integration-settings'
-    project-name: 'integration-netconf-pnp-simulator'
+    mvn-settings: "integration-settings"
+    project-name: "integration-netconf-pnp-simulator"
     gerrit_trigger_file_paths:
       - compare-type: ANT
-        pattern: 'test/mocks/netconf-pnp-simulator/engine/**'
-    docker-name: 'onap/integration/simulators/netconf-pnp-simulator'
+        pattern: "test/mocks/netconf-pnp-simulator/engine/**"
+    docker-name: "onap/integration/simulators/netconf-pnp-simulator"
     docker-root: test/mocks/netconf-pnp-simulator/engine
     container-tag-method: yaml-file
     post_docker_build_script: |
-        #!/bin/bash
-        set -eux
-        cd "$DOCKER_ROOT"
-        # To simplify the references inside tox.ini and tests/settings.py
-        docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
-        tox
+      #!/bin/bash
+      set -eux
+      cd "$DOCKER_ROOT"
+      # To simplify the references inside tox.ini and tests/settings.py
+      docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest
+      tox
     build-node: ubuntu1804-docker-8c-8g
     build-timeout: 20
     jobs:
@@ -50,29 +50,29 @@
       - gerrit-docker-merge
 
 - project:
-      name: integration-ran-nssmf-simulator
-      project: integration
-      stream:
-          - 'master':
-                branch: 'master'
-      # Required by verifier
-      mvn-settings: 'integration-settings'
-      project-name: 'integration-ran-nssmf-simulator'
-      gerrit_trigger_file_paths:
-          - compare-type: REG_EXP
-            pattern: 'test/mocks/ran-nssmf-simulator/.*'
-      docker-name: 'onap/ran-nssmf-simulator'
-      docker-root: test/mocks/ran-nssmf-simulator
-      container-tag-method: yaml-file
-      post_docker_build_script: |
-          #!/bin/bash
-          set -eux
-          cd "$DOCKER_ROOT"
-          # To simplify the references inside tox.ini and tests/settings.py
-          docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" ran-nssmf-simulator:latest
-          tox
-      build-node: ubuntu1804-docker-8c-8g
-      build-timeout: 20
-      jobs:
-          - gerrit-docker-verify
-          - gerrit-docker-merge
+    name: integration-ran-nssmf-simulator
+    project: integration
+    stream:
+      - "master":
+          branch: "master"
+    # Required by verifier
+    mvn-settings: "integration-settings"
+    project-name: "integration-ran-nssmf-simulator"
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: "test/mocks/ran-nssmf-simulator/.*"
+    docker-name: "onap/ran-nssmf-simulator"
+    docker-root: test/mocks/ran-nssmf-simulator
+    container-tag-method: yaml-file
+    post_docker_build_script: |
+      #!/bin/bash
+      set -eux
+      cd "$DOCKER_ROOT"
+      # To simplify the references inside tox.ini and tests/settings.py
+      docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" ran-nssmf-simulator:latest
+      tox
+    build-node: ubuntu1804-docker-8c-8g
+    build-timeout: 20
+    jobs:
+      - gerrit-docker-verify
+      - gerrit-docker-merge
diff --git a/jjb/integration/integration-ietf-actn-tools.yaml b/jjb/integration/integration-ietf-actn-tools.yaml
index 991d77f06..62d230336 100644
--- a/jjb/integration/integration-ietf-actn-tools.yaml
+++ b/jjb/integration/integration-ietf-actn-tools.yaml
@@ -21,31 +21,30 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
-      - 'js':
-          tox-dir: '.'
-          tox-envs: 'js'
-          pattern: '**/*.js'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+      - "js":
+          tox-dir: "."
+          tox-envs: "js"
+          pattern: "**/*.js"
     stream:
-      - 'master':
-          branch: 'master'
-
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 5dd267283..5e9099908 100644
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -4,45 +4,43 @@
     parameters:
       - string:
           name: TESTPLAN
-          default: '{test-plan}'
-          description: 'General test plan we will run unless stream-specific one is found'
+          default: "{test-plan}"
+          description: "General test plan we will run unless stream-specific one is found"
 
 - parameter:
     name: integration-test-options
     parameters:
       - string:
           name: TESTOPTIONS
-          default: '{test-options}'
-          description: 'Robot command options'
+          default: "{test-options}"
+          description: "Robot command options"
 
 - parameter:
     name: html-publisher-dir
     parameters:
       - string:
           name: HTMLDIR
-          default: '{html-dir}'
-          description: 'Directory location to be used by HTML publisher plugin'
+          default: "{html-dir}"
+          description: "Directory location to be used by HTML publisher plugin"
 
 - parameter:
     name: html-publisher-files
     parameters:
       - string:
           name: HTMLFILES
-          default: '{html-files}'
-          description: 'File name to be used by HTML publisher plugin to produce the report'
+          default: "{html-files}"
+          description: "File name to be used by HTML publisher plugin to produce the report"
 
 - builder:
     name: integration-install-robotframework
     builders:
-      - shell:
-          !include-raw:
+      - shell: !include-raw:
           - include-raw-integration-install-robotframework.sh
 
 - builder:
     name: integration-install-robotframework-py3
     builders:
-      - shell:
-          !include-raw:
+      - shell: !include-raw:
           - include-raw-integration-install-robotframework-py3.sh
 
 - builder:
@@ -92,26 +90,26 @@
     name: integration-robot
     publishers:
       - robot:
-          output-path: 'archives'
-          output-xml: '**/output.xml'
-          report-html: '**/report.html'
-          log-html: '**/log.html'
-          other-files: ''
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
+          output-path: "archives"
+          output-xml: "**/output.xml"
+          report-html: "**/report.html"
+          log-html: "**/log.html"
+          other-files: ""
+          unstable-threshold: "{unstable-if}"
+          pass-threshold: "{pass-if}"
           only-critical: false
 
 - publisher:
     name: integration-project-robot
     publishers:
       - robot:
-          output-path: 'csit/archives'
-          output-xml: '**/output.xml'
-          report-html: '**/report.html'
-          log-html: '**/log.html'
-          other-files: ''
-          unstable-threshold: '{unstable-if}'
-          pass-threshold: '{pass-if}'
+          output-path: "csit/archives"
+          output-xml: "**/output.xml"
+          report-html: "**/report.html"
+          log-html: "**/log.html"
+          other-files: ""
+          unstable-threshold: "{unstable-if}"
+          pass-threshold: "{pass-if}"
           only-critical: false
 
 - publisher:
diff --git a/jjb/integration/integration-python-onapsdk.yaml b/jjb/integration/integration-python-onapsdk.yaml
index 7fff52dc2..d3f4b01ab 100644
--- a/jjb/integration/integration-python-onapsdk.yaml
+++ b/jjb/integration/integration-python-onapsdk.yaml
@@ -8,21 +8,21 @@
     jobs:
       - integration-linters
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     subproject:
-      - 'python3.7':
-          tox-dir: '.'
-          tox-envs: 'py37'
-          pattern: '**/*.py'
-      - 'python3.8':
-          tox-dir: '.'
-          tox-envs: 'py38'
-          pattern: '**/*.py'
-      - 'python3.9':
-          tox-dir: '.'
-          tox-envs: 'py39'
-          pattern: '**/*.py'
+      - "python3.7":
+          tox-dir: "."
+          tox-envs: "py37"
+          pattern: "**/*.py"
+      - "python3.8":
+          tox-dir: "."
+          tox-envs: "py38"
+          pattern: "**/*.py"
+      - "python3.9":
+          tox-dir: "."
+          tox-envs: "py39"
+          pattern: "**/*.py"
       # Disable due to https://jira.linuxfoundation.org/plugins/servlet/desk/portal/2/IT-25247
       # - 'python3.10':
       #     tox-dir: '.'
@@ -32,18 +32,18 @@
       #     tox-dir: '.'
       #     tox-envs: 'py311'
       #     pattern: '**/*.py'
-      - 'pylint':
-          tox-dir: '.'
-          tox-envs: 'pylint'
-          pattern: '**/*.py'
-      - 'pydocstyle':
-          tox-dir: '.'
-          tox-envs: 'pydocstyle'
-          pattern: '**/*.py'
-      - 'bandit':
-          tox-dir: '.'
-          tox-envs: 'bandit'
-          pattern: '**/*.py'
+      - "pylint":
+          tox-dir: "."
+          tox-envs: "pylint"
+          pattern: "**/*.py"
+      - "pydocstyle":
+          tox-dir: "."
+          tox-envs: "pydocstyle"
+          pattern: "**/*.py"
+      - "bandit":
+          tox-dir: "."
+          tox-envs: "bandit"
+          pattern: "**/*.py"
 
 - project:
     name: integration-python-onapsdk-project-view
@@ -64,8 +64,8 @@
     project: integration/python-onapsdk
     project-name: integration-python-onapsdk
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     jobs:
       - gerrit-pypi-verify
 
@@ -74,8 +74,8 @@
     project: integration/python-onapsdk
     project-name: integration-python-onapsdk
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     jobs:
       - gerrit-pypi-release-verify
       - gerrit-pypi-release-merge:
diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml
index f710ea974..d3f329dff 100644
--- a/jjb/integration/integration-seccom.yaml
+++ b/jjb/integration/integration-seccom.yaml
@@ -9,29 +9,29 @@
     branch: master
 
 - project:
-      name: integration-seccom-linters
-      project: integration/seccom
-      project-name: integration-seccom
-      python-version: python3
-      jobs:
-          - integration-linters
-      subproject:
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'json':
-                tox-dir: '.'
-                tox-envs: 'json'
-                pattern: '**/*.json'
-          - 'md':
-              tox-dir: '.'
-              tox-envs: 'md'
-              pattern: '**/*.md'
-      stream:
-          - 'master':
-                branch: 'master'
+    name: integration-seccom-linters
+    project: integration/seccom
+    project-name: integration-seccom
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+    stream:
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 8013af243..ae6f9f558 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -1,55 +1,55 @@
 ---
 - job-template:
-    name: '{project-name}-{stream}-verify-csit-{functionality}'
+    name: "{project-name}-{stream}-verify-csit-{functionality}"
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
+    build-node: "ubuntu1804-docker-8c-8g"
+    node: "{build-node}"
+    recipients: ""
+    java-version: "openjdk11"
     python-version: python3
 
     properties:
       - lf-infra-properties:
-          project: 'integration/csit'
-          build-days-to-keep: '{build-days-to-keep}'
+          project: "integration/csit"
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: 'integration/csit'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "integration/csit"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
+          test-plan: "plans/{project-name}/{functionality}"
       - integration-test-options:
-          test-options: '{robot-options}'
+          test-options: "{robot-options}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: 'integration/csit'
-          branch: '{branch}'
-          files: '*/{project-name}/**'
+          server: "{server-name}"
+          project: "integration/csit"
+          branch: "{branch}"
+          files: "*/{project-name}/**"
 
     builders:
       - lf-update-java-alternatives:
-          java-version: '{java-version}'
+          java-version: "{java-version}"
       - integration-install-robotframework-py3
       - inject:
-          properties-file: 'env.properties'
+          properties-file: "env.properties"
       - integration-run-test
 
     publishers:
@@ -58,65 +58,65 @@
           pass-if: 100.0
       - lf-infra-publish
       - email:
-          recipients: '{recipients}'
+          recipients: "{recipients}"
           notify-every-unstable-build: false
           send-to-individuals: true
 
 - job-template:
-    name: '{project-name}-{stream}-csit-{functionality}'
+    name: "{project-name}-{stream}-csit-{functionality}"
     disabled: false
 
     project-type: freestyle
-    build-node: 'ubuntu1804-docker-8c-8g'
-    node: '{build-node}'
-    recipients: ''
-    java-version: 'openjdk11'
+    build-node: "ubuntu1804-docker-8c-8g"
+    node: "{build-node}"
+    recipients: ""
+    java-version: "openjdk11"
     python-version: python3
 
     properties:
       - lf-infra-properties:
-          project: 'integration/csit'
-          build-days-to-keep: '{build-days-to-keep}'
+          project: "integration/csit"
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: 'integration/csit'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "integration/csit"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - integration-test-plan:
-          test-plan: 'plans/{project-name}/{functionality}'
+          test-plan: "plans/{project-name}/{functionality}"
       - integration-test-options:
-          test-options: '{robot-options}'
+          test-options: "{robot-options}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: 'integration/csit'
-          branch: '{branch}'
-          files: '*/{project-name}/**'
-      - timed: '@daily'
+          server: "{server-name}"
+          project: "integration/csit"
+          branch: "{branch}"
+          files: "*/{project-name}/**"
+      - timed: "@daily"
       - reverse:
-          jobs: '{obj:trigger_jobs}'
+          jobs: "{obj:trigger_jobs}"
 
     builders:
       - lf-infra-pre-build
       - lf-update-java-alternatives:
-          java-version: '{java-version}'
+          java-version: "{java-version}"
       - integration-install-robotframework-py3
       - inject:
-          properties-file: 'env.properties'
+          properties-file: "env.properties"
       - integration-run-test
 
     publishers:
@@ -125,7 +125,7 @@
           pass-if: 100.0
       - lf-infra-publish
       - email:
-          recipients: '{recipients}'
+          recipients: "{recipients}"
           notify-every-unstable-build: false
           send-to-individuals: true
 
@@ -141,7 +141,7 @@
     build-days-to-keep: 30 # 30 days in case a release takes long to get approved.
     build-node: ubuntu1804-docker-8c-8g
     build-timeout: 60
-    container-public-registry: 'nexus3.onap.org:10001'
+    container-public-registry: "nexus3.onap.org:10001"
     git-url: "$GIT_URL/$PROJECT"
     github-url: "https://github.com"
     maven-versions-plugin: false
@@ -166,8 +166,8 @@
       **/target/surefire-reports/*-output.txt
 
     project-type: freestyle
-    node: '{build-node}'
-    java-version: 'openjdk11'
+    node: "{build-node}"
+    java-version: "openjdk11"
 
     #####################
     # Job Configuration #
@@ -175,14 +175,14 @@
     concurrent: "{build-concurrent}"
     properties:
       - lf-infra-properties:
-          project: '{project}'
-          build-days-to-keep: '{build-days-to-keep}'
+          project: "{project}"
+          build-days-to-keep: "{build-days-to-keep}"
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - lf-infra-maven-parameters:
           mvn-opts: "{mvn-opts}"
           mvn-params: "{mvn-params}"
@@ -192,11 +192,11 @@
           default: "{archive-artifacts}"
           description: Artifacts to archive to the logs server.
       - integration-test-options:
-          test-options: '{robot-options}'
+          test-options: "{robot-options}"
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
     builders:
       - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
@@ -224,7 +224,7 @@
           mvn-goals: "{mvn-goals}"
       - integration-install-robotframework-py3
       - inject:
-          properties-file: 'env.properties'
+          properties-file: "env.properties"
       - integration-run-project-test
       - lf-provide-maven-settings-cleanup
     publishers:
@@ -233,7 +233,7 @@
           pass-if: 100.0
       - lf-infra-publish
       - email:
-          recipients: '{recipients}'
+          recipients: "{recipients}"
           notify-every-unstable-build: false
           send-to-individuals: true
 
@@ -247,21 +247,21 @@
     #  3. give a verify vote to the triggering review
     #
 
-    name: '{project-name}-review-verification-maven-{stream}'
+    name: "{project-name}-review-verification-maven-{stream}"
 
     <<: *verification_maven_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
 
 - job-template:
     # Job template for unified merge verification jobs in
@@ -272,18 +272,18 @@
     #  2. run CSIT job with the local images
     #
 
-    name: '{project-name}-merge-verification-maven-{stream}'
+    name: "{project-name}-merge-verification-maven-{stream}"
 
     <<: *verification_maven_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
     triggers:
       - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index a0fafde4e..2787f6838 100644
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -1,58 +1,58 @@
 ---
 - job-template:
-    name: '{project-name}-{stream}-{subproject}-docker-merge'
+    name: "{project-name}-{stream}-{subproject}-docker-merge"
     id: integration-docker-merge
     project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
-    docker-image-name: ''
-    mvn-goals: 'clean package docker:build docker:push'
+    node: "ubuntu1804-docker-8c-8g"
+    docker-image-name: ""
+    mvn-goals: "clean package docker:build docker:push"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
       - docker-image-name:
-          docker-image-name: '{docker-image-name}'
+          docker-image-name: "{docker-image-name}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
 
     builders:
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
 
       - docker-login
 
       - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
+          maven-version: "{maven-version}"
+          pom: "{pom}"
+          goals: "{mvn-goals}"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
           properties:
             - docker.pull.registry=nexus3.onap.org:10001
@@ -62,113 +62,113 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-{stream}-{subproject}-docker-verify'
+    name: "{project-name}-{stream}-{subproject}-docker-verify"
     id: integration-docker-verify
     project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
-    docker-image-name: ''
-    mvn-goals: 'clean package docker:build'
-    post-docker-verify-script: ''
+    node: "ubuntu1804-docker-8c-8g"
+    docker-image-name: ""
+    mvn-goals: "clean package docker:build"
+    post-docker-verify-script: ""
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
       - docker-image-name:
-          docker-image-name: '{docker-image-name}'
+          docker-image-name: "{docker-image-name}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
 
     builders:
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
 
       - docker-login
 
       - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: '{mvn-goals}'
-          settings: '{mvn-settings}'
+          maven-version: "{maven-version}"
+          pom: "{pom}"
+          goals: "{mvn-goals}"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
           properties:
             - docker.pull.registry=nexus3.onap.org:10001
             - docker.push.registry=nexus3.onap.org:10003
-      - shell: '{post-docker-verify-script}'
+      - shell: "{post-docker-verify-script}"
 
     publishers:
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-{stream}-{subproject}-docker-compose-verify'
+    name: "{project-name}-{stream}-{subproject}-docker-compose-verify"
     id: integration-docker-compose-verify
     project-type: freestyle
-    description: 'This job validates Docker Compose based projects'
-    node: 'ubuntu1804-docker-8c-8g'
-    docker_root: '$WORKSPACE'
-    post_script: ''
-    netconf_sim_service_name: ''
+    description: "This job validates Docker Compose based projects"
+    node: "ubuntu1804-docker-8c-8g"
+    docker_root: "$WORKSPACE"
+    post_script: ""
+    netconf_sim_service_name: ""
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
 
     builders:
       - inject:
           properties-content: |
             DOCKER_ROOT={docker_root}
             NETCONF_SIM_SERVICE_NAME={netconf_sim_service_name}
-      - shell: '{script}'
-      - shell: '{post_script}'
+      - shell: "{script}"
+      - shell: "{post_script}"
 
     publishers:
       - integration-docker-compose-logs
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 34e3ed6cc..9265ee29c 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -5,41 +5,41 @@
     # The purpose of this job template is to run:
     # vagrant validate
 
-    name: '{project-name}-{stream}-verify-vagrantfile'
+    name: "{project-name}-{stream}-verify-vagrantfile"
     project-type: freestyle
-    description: 'Job intended for validating vagrantfiles'
+    description: "Job intended for validating vagrantfiles"
     node: ubuntu1804-builder-4c-4g
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**/Vagrantfile'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**/Vagrantfile"
 
     builders:
       - integration-install-vagrant
-      - shell: !include-raw-escape: 'vagrantfile-verify.sh'
+      - shell: !include-raw-escape: "vagrantfile-verify.sh"
 
     publishers:
       - lf-infra-publish
@@ -53,84 +53,84 @@
     #     tox-dir:        Directory containing the project's tox.ini
     #     pattern:        List of file patterns to scan
 
-    name: '{project-name}-{stream}-{subproject}-lint'
+    name: "{project-name}-{stream}-{subproject}-lint"
     id: integration-linters
     project-type: freestyle
-    description: 'Job intended for running linters with Tox and Coala'
+    description: "Job intended for running linters with Tox and Coala"
     build-node: centos8-builder-2c-1g
-    node: '{build-node}'
+    node: "{build-node}"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - lf-infra-tox-parameters:
-          tox-dir: '{tox-dir}'
-          tox-envs: '{tox-envs}'
+          tox-dir: "{tox-dir}"
+          tox-envs: "{tox-envs}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
 
     builders:
       - lf-infra-tox-install:
-          python-version: '{python-version}'
+          python-version: "{python-version}"
       - lf-infra-tox-run:
-          parallel: 'false'
+          parallel: "false"
 
     publishers:
       - lf-infra-publish
 
 - job-template:
     <<: *tox_verify_boilerplate
-    name: '{project-name}-{stream}-{subproject}-tox-verify'
+    name: "{project-name}-{stream}-{subproject}-tox-verify"
     id: integration-tox-verify
-    description: 'Job intended for running tox'
+    description: "Job intended for running tox"
 
 - job-template:
     <<: *tox_verify_boilerplate
-    name: '{project-name}-{stream}-{subproject}-terraform-verify'
+    name: "{project-name}-{stream}-{subproject}-terraform-verify"
     terraform-version: 0.13.2
     terragrunt-version: 0.24.1
     python-version: python3
     id: integration-terraform-verify
-    description: 'Job intended for validating terraform modules'
+    description: "Job intended for validating terraform modules"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - lf-infra-tox-parameters:
-          tox-dir: '{tox-dir}'
-          tox-envs: '{tox-envs}'
+          tox-dir: "{tox-dir}"
+          tox-envs: "{tox-envs}"
       - integration-terraform-version:
-          terraform-version: '{terraform-version}'
+          terraform-version: "{terraform-version}"
       - integration-terragrunt-version:
-          terragrunt-version: '{terragrunt-version}'
+          terragrunt-version: "{terragrunt-version}"
 
     builders:
       - integration-install-terraform
       - integration-install-terragrunt
       - lf-infra-tox-install:
-          python-version: '{python-version}'
+          python-version: "{python-version}"
       - lf-infra-tox-run:
-          parallel: 'false'
+          parallel: "false"
diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index cb8286d8a..9d289a4d8 100644
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -19,97 +19,97 @@
     project-name: integration
     project: integration
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-settings'
-    build-node: 'ubuntu1804-builder-4c-4g'
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-settings"
+    build-node: "ubuntu1804-builder-4c-4g"
     subproject:
-      - 'test-vcpe':
-          path: 'test/vcpe'
-          pattern: 'test/vcpe/**'
-      - 'ran-nssmf-simulator':
-          path: 'test/mocks/ran-nssmf-simulator'
-          pattern: 'test/mocks/ran-nssmf-simulator/**'
+      - "test-vcpe":
+          path: "test/vcpe"
+          pattern: "test/vcpe/**"
+      - "ran-nssmf-simulator":
+          path: "test/mocks/ran-nssmf-simulator"
+          pattern: "test/mocks/ran-nssmf-simulator/**"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-python'
+      - "{project-name}-{stream}-{subproject}-verify-python"
 
 - project:
     name: integration-verify-vagrantfile
-    project-name: 'integration'
-    project: 'integration'
+    project-name: "integration"
+    project: "integration"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
     jobs:
-      - '{project-name}-{stream}-verify-vagrantfile'
+      - "{project-name}-{stream}-verify-vagrantfile"
 
 - project:
     name: integration-verify-golang
-    project-name: 'integration'
-    project: 'integration'
-    golangver: 'golang114'
-    mvn-settings: 'integration-settings'
-    archive-artifacts: ''
+    project-name: "integration"
+    project: "integration"
+    golangver: "golang114"
+    mvn-settings: "integration-settings"
+    archive-artifacts: ""
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-golang'
+      - "{project-name}-{stream}-{subproject}-verify-golang"
     subproject:
-      - 'test-security-k8s':
-          path: 'test/security/k8s'
-          pattern: '{path}/**'
+      - "test-security-k8s":
+          path: "test/security/k8s"
+          pattern: "{path}/**"
           build-node: ubuntu1804-builder-4c-4g
           script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/{path}
-              make test
-      - 'test-security-sslendpoints':
-          path: 'test/security/sslendpoints'
-          pattern: '{path}/**'
+            #!/bin/bash
+            set -ex # Fail build if any setup step fails
+            cd $WORKSPACE/{path}
+            make test
+      - "test-security-sslendpoints":
+          path: "test/security/sslendpoints"
+          pattern: "{path}/**"
           build-node: ubuntu1804-docker-8c-8g
           script: |
-              #!/bin/bash
-              set -ex # Fail build if any setup step fails
-              cd $WORKSPACE/{path}
-              rm -rf $WORKSPACE/{path}/bin
-              make docker-build
-              make test
-              make clean
+            #!/bin/bash
+            set -ex # Fail build if any setup step fails
+            cd $WORKSPACE/{path}
+            rm -rf $WORKSPACE/{path}/bin
+            make docker-build
+            make test
+            make clean
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
 
 - project:
     name: integration-linters
-    project: 'integration'
-    project-name: 'integration'
+    project: "integration"
+    project-name: "integration"
     python-version: python3
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'rst':
-          tox-dir: '.'
-          tox-envs: 'rst'
-          pattern: '**/*.rst'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+      - "rst":
+          tox-dir: "."
+          tox-envs: "rst"
+          pattern: "**/*.rst"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
index ed7c32e2b..527cead3e 100644
--- a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
+++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml
@@ -13,27 +13,27 @@
     project-name: integration-5G-core-nf-simulator
     project: integration/simulators/5G-core-nf-simulator
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-simulators-5G-core-nf-simulator-settings'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-5G-core-nf-simulator-settings"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
     subproject:
-      - 'AMF':
-          path: 'coresim/AMF/'
-          pattern: 'coresim/AMF/**'
-          pom: 'coresim/AMF/pom.xml'
-      - 'SMF':
-          path: 'coresim/SMF/'
-          pattern: 'coresim/SMF/**'
-          pom: 'coresim/SMF/pom.xml'
-      - 'UPF':
-          path: 'coresim/UPF/'
-          pattern: 'coresim/UPF/**'
-          pom: 'coresim/UPF/pom.xml'
+      - "AMF":
+          path: "coresim/AMF/"
+          pattern: "coresim/AMF/**"
+          pom: "coresim/AMF/pom.xml"
+      - "SMF":
+          path: "coresim/SMF/"
+          pattern: "coresim/SMF/**"
+          pom: "coresim/SMF/pom.xml"
+      - "UPF":
+          path: "coresim/UPF/"
+          pattern: "coresim/UPF/**"
+          pom: "coresim/UPF/pom.xml"
     jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java':
-          mvn-goals: 'clean install'
+      - "{project-name}-{stream}-{subproject}-verify-java":
+          mvn-goals: "clean install"
 
 - project:
     name: integration-5G-core-nf-simulator-linters
@@ -43,26 +43,26 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
index 17d3d9be2..7fe573362 100644
--- a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
+++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: integration-simulators-A1-policy-enforcement-simulator-info
     project: integration/simulators/A1-policy-enforcement-simulator
@@ -14,15 +13,15 @@
     project-name: integration-simulators-A1-policy-enforcement-simulator
     java-version: openjdk11
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-simulators-A1-policy-enforcement-simulator-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-A1-policy-enforcement-simulator-settings"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
     jobs:
-        - '{project-name}-{stream}-verify-java':
-            mvn-goals: 'clean install'
+      - "{project-name}-{stream}-verify-java":
+          mvn-goals: "clean install"
 
 - project:
     name: integration-simulators-A1-policy-enforcement-simulator-linters
@@ -32,26 +31,26 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
index 8130a6bdb..fe5d97ab5 100644
--- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml
@@ -12,30 +12,30 @@
     project: integration/simulators/core-nssmf-simulator
     project-name: integration-simulators-core-nssmf-simulator
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'integration-simulators-core-nssmf-simulator-settings'
-    files: '**'
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-core-nssmf-simulator-settings"
+    files: "**"
     maven-deploy-properties: |
-        deployAtEnd=true
-    archive-artifacts: ''
+      deployAtEnd=true
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
     jobs:
-        - '{project-name}-{stream}-verify-java':
-            mvn-goals: 'clean install'
-        - '{project-name}-{stream}-merge-java':
-            mvn-goals: 'clean deploy'
-        - '{project-name}-gerrit-release-jobs':
-            build-node: centos7-docker-2c-1g
-        - gerrit-maven-docker-stage:
-            build-node: centos8-docker-8c-8g
-            maven-versions-plugin: true
-            container-public-registry: 'nexus3.onap.org:10001'
-            container-staging-registry: 'nexus3.onap.org:10003'
-            mvn-goals: 'clean deploy'
-            mvn-params: '-P docker'
-        - gerrit-maven-stage:
-            sign-artifacts: true
-            build-node: centos8-docker-8c-8g
-            maven-versions-plugin: true
-            mvn-goals: 'clean deploy'
+      - "{project-name}-{stream}-verify-java":
+          mvn-goals: "clean install"
+      - "{project-name}-{stream}-merge-java":
+          mvn-goals: "clean deploy"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean deploy"
+          mvn-params: "-P docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: "clean deploy"
diff --git a/jjb/integration/simulators/integration-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml
index 7c1f81807..dc82c3341 100644
--- a/jjb/integration/simulators/integration-onap-components-simulators.yaml
+++ b/jjb/integration/simulators/integration-onap-components-simulators.yaml
@@ -1,85 +1,86 @@
+---
 - project:
-    name: 'integration-onap-components-simulators-docker'
+    name: "integration-onap-components-simulators-docker"
     jobs:
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-aai'
+          project-name: "integration-onap-component-simulators-aai"
           docker-root: ./mock-aai
-          docker-name: 'onap/onap-component-mock-aai'
+          docker-name: "onap/onap-component-mock-aai"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-aai'
+          project-name: "integration-onap-component-simulators-aai"
           docker-root: ./mock-aai
-          docker-name: 'onap/onap-component-mock-aai'
+          docker-name: "onap/onap-component-mock-aai"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-cds'
+          project-name: "integration-onap-component-simulators-cds"
           docker-root: ./mock-cds
-          docker-name: 'onap/onap-component-mock-cds'
+          docker-name: "onap/onap-component-mock-cds"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-cds'
+          project-name: "integration-onap-component-simulators-cds"
           docker-root: ./mock-cds
-          docker-name: 'onap/onap-component-mock-cds'
+          docker-name: "onap/onap-component-mock-cds"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-clamp'
+          project-name: "integration-onap-component-simulators-clamp"
           docker-root: ./mock-clamp
-          docker-name: 'onap/onap-component-mock-clamp'
+          docker-name: "onap/onap-component-mock-clamp"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-clamp'
+          project-name: "integration-onap-component-simulators-clamp"
           docker-root: ./mock-clamp
-          docker-name: 'onap/onap-component-mock-clamp'
+          docker-name: "onap/onap-component-mock-clamp"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-dmaap'
+          project-name: "integration-onap-component-simulators-dmaap"
           docker-root: ./mock-dmaap
-          docker-name: 'onap/onap-component-mock-dmaap'
+          docker-name: "onap/onap-component-mock-dmaap"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-dmaap'
+          project-name: "integration-onap-component-simulators-dmaap"
           docker-root: ./mock-dmaap
-          docker-name: 'onap/onap-component-mock-dmaap'
+          docker-name: "onap/onap-component-mock-dmaap"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-msb-k8s'
+          project-name: "integration-onap-component-simulators-msb-k8s"
           docker-root: ./mock-msb-k8s
-          docker-name: 'onap/onap-component-mock-k8s'
+          docker-name: "onap/onap-component-mock-k8s"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-msb-k8s'
+          project-name: "integration-onap-component-simulators-msb-k8s"
           docker-root: ./mock-msb-k8s
-          docker-name: 'onap/onap-component-mock-k8s'
+          docker-name: "onap/onap-component-mock-k8s"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-sdc'
+          project-name: "integration-onap-component-simulators-sdc"
           docker-root: ./mock-sdc
-          docker-name: 'onap/onap-component-mock-sdc'
+          docker-name: "onap/onap-component-mock-sdc"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-sdc'
+          project-name: "integration-onap-component-simulators-sdc"
           docker-root: ./mock-sdc
-          docker-name: 'onap/onap-component-mock-sdc'
+          docker-name: "onap/onap-component-mock-sdc"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-sdnc'
+          project-name: "integration-onap-component-simulators-sdnc"
           docker-root: ./mock-sdnc
-          docker-name: 'onap/onap-component-mock-sdnc'
+          docker-name: "onap/onap-component-mock-sdnc"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-sdnc'
+          project-name: "integration-onap-component-simulators-sdnc"
           docker-root: ./mock-sdnc
-          docker-name: 'onap/onap-component-mock-sdnc'
+          docker-name: "onap/onap-component-mock-sdnc"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-so'
+          project-name: "integration-onap-component-simulators-so"
           docker-root: ./mock-so
-          docker-name: 'onap/onap-component-mock-so'
+          docker-name: "onap/onap-component-mock-so"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-so'
+          project-name: "integration-onap-component-simulators-so"
           docker-root: ./mock-so
-          docker-name: 'onap/onap-component-mock-so'
+          docker-name: "onap/onap-component-mock-so"
       - gerrit-docker-verify:
-          project-name: 'integration-onap-component-simulators-ves'
+          project-name: "integration-onap-component-simulators-ves"
           docker-root: ./mock-ves
-          docker-name: 'onap/onap-component-mock-ves'
+          docker-name: "onap/onap-component-mock-ves"
       - gerrit-docker-merge:
-          project-name: 'integration-onap-component-simulators-ves'
+          project-name: "integration-onap-component-simulators-ves"
           docker-root: ./mock-ves
-          docker-name: 'onap/onap-component-mock-ves'
-    project: 'integration/onap-component-simulators'
+          docker-name: "onap/onap-component-mock-ves"
+    project: "integration/onap-component-simulators"
     stream:
-      - 'master':
-            branch: 'master'
-            files: ''
-    docker-root: '$WORKSPACE'
-    mvn-settings: 'integration-settings'
+      - "master":
+          branch: "master"
+          files: ""
+    docker-root: "$WORKSPACE"
+    mvn-settings: "integration-settings"
     build-node: ubuntu1804-docker-8c-8g
-    cron: '@daily'
-    container-tag-method: stream
\ No newline at end of file
+    cron: "@daily"
+    container-tag-method: stream
diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index b87757cfe..ff682a2c0 100644
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -1,105 +1,103 @@
 ---
 - project:
-      name: integration-simulators-pnf-simulator
-      project-name: integration-pnf-simulator
-      stream:
-          -   'master':
-                  branch: 'master'
-                  java-version: openjdk11
-      project: 'integration/simulators/pnf-simulator'
-      mvn-settings: 'integration-simulators-pnf-simulator-settings'
-      files: '**'
-      maven-deploy-properties: |
-          deployAtEnd=true
-      archive-artifacts: ''
-      build-node: ubuntu1804-docker-8c-8g
-      jobs:
-          - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true'
-          - '{project-name}-{stream}-merge-java':
-                mvn-goals: 'clean deploy'
-          -  '{project-name}-gerrit-release-jobs':
-                 build-node: centos7-docker-2c-1g
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-goals: 'clean deploy'
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false'
+    name: integration-simulators-pnf-simulator
+    project-name: integration-pnf-simulator
+    stream:
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    project: "integration/simulators/pnf-simulator"
+    mvn-settings: "integration-simulators-pnf-simulator-settings"
+    files: "**"
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java":
+          mvn-goals: "clean install -P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=true"
+      - "{project-name}-{stream}-merge-java":
+          mvn-goals: "clean deploy"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: "clean deploy"
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false"
 
 - project:
-      name: integration-simulators-pnf-simulator-sonar
-      java-version: openjdk11
-      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-docker-8c-8g
-      project: integration/simulators/pnf-simulator
-      project-name: integration-pnf-simulator
-      branch: 'master'
-      mvn-settings: 'integration-simulators-pnf-simulator-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
+    name: integration-simulators-pnf-simulator-sonar
+    java-version: openjdk11
+    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-docker-8c-8g
+    project: integration/simulators/pnf-simulator
+    project-name: integration-pnf-simulator
+    branch: "master"
+    mvn-settings: "integration-simulators-pnf-simulator-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-pnf-simulator-info
-      project-name: integration-pnf-simulator
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: integration/simulators/pnf-simulator
-      branch: master
+    name: integration-simulators-pnf-simulator-info
+    project-name: integration-pnf-simulator
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: integration/simulators/pnf-simulator
+    branch: master
 
 - project:
-      name: integration-simulators-pnf-simulator-cli
-      project: integration/simulators/pnf-simulator
-      project-name: integration-pnf-simulator
-      python-version: python3
-      jobs:
-          - integration-tox-verify
-      subproject:
-          - 'simulator-cli':
-                tox-dir: 'simulator-cli'
-                tox-envs: 'pytest'
-                pattern: '**/*'
-      stream:
-          - 'master':
-                branch: 'master'
+    name: integration-simulators-pnf-simulator-cli
+    project: integration/simulators/pnf-simulator
+    project-name: integration-pnf-simulator
+    python-version: python3
+    jobs:
+      - integration-tox-verify
+    subproject:
+      - "simulator-cli":
+          tox-dir: "simulator-cli"
+          tox-envs: "pytest"
+          pattern: "**/*"
+    stream:
+      - "master":
+          branch: "master"
 
 - project:
-      name: integration-simulators-pnf-simulator-linters
-      project: integration/simulators/pnf-simulator
-      project-name: integration-pnf-simulator
-      python-version: python3
-      jobs:
-          - integration-linters
-      subproject:
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'json':
-                tox-dir: '.'
-                tox-envs: 'json'
-                pattern: '**/*.json'
-          - 'python':
-                tox-dir: '.'
-                tox-envs: 'py'
-                pattern: '**/*.py'
-      stream:
-          - 'master':
-                branch: 'master'
-
+    name: integration-simulators-pnf-simulator-linters
+    project: integration/simulators/pnf-simulator
+    project-name: integration-pnf-simulator
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+    stream:
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
index c9b93d9b4..83456d9ea 100644
--- a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml
@@ -21,26 +21,26 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 2a9f75b35..c630a870f 100644
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -1,31 +1,31 @@
 ---
 - project:
-      name: integration-simulators-ran-simulator
-      project-name: integration-simulators-ran-simulator
-      stream:
-          -   'master':
-                  branch: 'master'
-      project: 'integration/simulators/ran-simulator'
-      mvn-settings: 'integration-simulators-ran-simulator-settings'
-      maven-deploy-properties: |
-          deployAtEnd=true
-      archive-artifacts: ''
-      build-node: ubuntu1804-docker-8c-8g
-      jobs:
-          - '{project-name}-{stream}-verify-java':
-                mvn-goals: 'clean install'
-                pattern: 'ransim/**'
-                pom: 'ransim/pom.xml'
-          - '{project-name}-{stream}-merge-java':
-                mvn-goals: 'clean deploy'
-                pom: 'ransim/pom.xml'
-          -  '{project-name}-gerrit-release-jobs':
-                 build-node: centos7-docker-2c-1g
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-goals: 'clean deploy'
+    name: integration-simulators-ran-simulator
+    project-name: integration-simulators-ran-simulator
+    stream:
+      - "master":
+          branch: "master"
+    project: "integration/simulators/ran-simulator"
+    mvn-settings: "integration-simulators-ran-simulator-settings"
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ""
+    build-node: ubuntu1804-docker-8c-8g
+    jobs:
+      - "{project-name}-{stream}-verify-java":
+          mvn-goals: "clean install"
+          pattern: "ransim/**"
+          pom: "ransim/pom.xml"
+      - "{project-name}-{stream}-merge-java":
+          mvn-goals: "clean deploy"
+          pom: "ransim/pom.xml"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-goals: "clean deploy"
 
 - project:
     name: integration-simulators-ran-simulator-info
@@ -44,18 +44,18 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
index 299ababfe..36a625e4e 100644
--- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml
@@ -1,65 +1,65 @@
 ---
 - project:
-      name: integration-simulators-nf-simulator-pm-https-server
-      project-name: 'integration-simulators-nf-simulator-pm-https-server'
-      java-version: openjdk11
-      jobs:
-          - '{project-name}-{stream}-verify-java'
-          - '{project-name}-{stream}-merge-java'
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean install -P docker -DskipDockerPush=false'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-2c-1g
+    name: integration-simulators-nf-simulator-pm-https-server
+    project-name: "integration-simulators-nf-simulator-pm-https-server"
+    java-version: openjdk11
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean install -P docker -DskipDockerPush=false"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: 'integration/simulators/nf-simulator/pm-https-server'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
-      # due to a strange macro / variable translation problem this needs
-      # to be passed as a string block to properly get the properties
-      # correctly defined in the job
-      maven-deploy-properties: |
-          deployAtEnd=true
-      files: '**'
-      archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+    project: "integration/simulators/nf-simulator/pm-https-server"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-pm-https-server-settings"
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
-      name: integration-simulators-nf-simulator-pm-https-server-sonar
-      java-version: openjdk11
-      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-docker-8c-8g
-      project: 'integration/simulators/nf-simulator/pm-https-server'
-      project-name: 'integration-simulators-nf-simulator-pm-https-server'
-      branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-pm-https-server-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: integration-simulators-nf-simulator-pm-https-server-sonar
+    java-version: openjdk11
+    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-docker-8c-8g
+    project: "integration/simulators/nf-simulator/pm-https-server"
+    project-name: "integration-simulators-nf-simulator-pm-https-server"
+    branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-pm-https-server-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-nf-simulator-pm-https-server-view
-      project-name: integration-simulators-nf-simulator-pm-https-server
-      views:
-          - project-view
+    name: integration-simulators-nf-simulator-pm-https-server-view
+    project-name: integration-simulators-nf-simulator-pm-https-server
+    views:
+      - project-view
 
 - project:
-      name: integration-simulators-nf-simulator-pm-https-server-info
-      project: integration/simulators/nf-simulator/pm-https-server
-      project-name: integration-simulators-nf-simulator-pm-https-server
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: integration-simulators-nf-simulator-pm-https-server-info
+    project: integration/simulators/nf-simulator/pm-https-server
+    project-name: integration-simulators-nf-simulator-pm-https-server
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
index f242ec177..df86a28c0 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml
@@ -1,65 +1,65 @@
 ---
 - project:
-      name: integration-simulators-nf-simulator-avcn-manager
-      project-name: 'integration-simulators-nf-simulator-avcn-manager'
-      java-version: openjdk11
-      jobs:
-          - '{project-name}-{stream}-verify-java'
-          - '{project-name}-{stream}-merge-java'
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-2c-1g
+    name: integration-simulators-nf-simulator-avcn-manager
+    project-name: "integration-simulators-nf-simulator-avcn-manager"
+    java-version: openjdk11
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean deploy -P docker -DskipDockerPush=false"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: 'integration/simulators/nf-simulator/avcn-manager'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings'
-      # due to a strange macro / variable translation problem this needs
-      # to be passed as a string block to properly get the properties
-      # correctly defined in the job
-      maven-deploy-properties: |
-          deployAtEnd=true
-      files: '**'
-      archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+    project: "integration/simulators/nf-simulator/avcn-manager"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-avcn-manager-settings"
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
-      name: integration-simulators-nf-simulator-avcn-manager-sonar
-      java-version: openjdk11
-      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-docker-8c-8g
-      project: 'integration/simulators/nf-simulator/avcn-manager'
-      project-name: 'integration-simulators-nf-simulator-avcn-manager'
-      branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-avcn-manager-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: integration-simulators-nf-simulator-avcn-manager-sonar
+    java-version: openjdk11
+    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-docker-8c-8g
+    project: "integration/simulators/nf-simulator/avcn-manager"
+    project-name: "integration-simulators-nf-simulator-avcn-manager"
+    branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-avcn-manager-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-nf-simulator-avcn-manager-view
-      project-name: integration-simulators-nf-simulator-avcn-manager
-      views:
-          - project-view
+    name: integration-simulators-nf-simulator-avcn-manager-view
+    project-name: integration-simulators-nf-simulator-avcn-manager
+    views:
+      - project-view
 
 - project:
-      name: integration-simulators-nf-simulator-avcn-manager-info
-      project: integration/simulators/nf-simulator/avcn-manager
-      project-name: integration-simulators-nf-simulator-avcn-manager
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: integration-simulators-nf-simulator-avcn-manager-info
+    project: integration/simulators/nf-simulator/avcn-manager
+    project-name: integration-simulators-nf-simulator-avcn-manager
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
index 141639448..633796c11 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server-csit.yaml
@@ -1,15 +1,16 @@
+---
 - project:
-      name: integration-simulators-nf-simulator-netconf-server-csit
-      jobs:
-          - '{project-name}-{stream}-verify-csit-{functionality}'
-          - '{project-name}-{stream}-csit-{functionality}'
-      project-name: 'integration-simulators-nf-simulator-netconf-server'
-      recipients: 'krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com'
-      stream:
-          - 'master':
-                branch: 'master'
-      functionality:
-          - 'testsuites':
-                trigger_jobs:
-                    - '{project-name}-{stream}-merge-java'
-      robot-options: ''
+    name: integration-simulators-nf-simulator-netconf-server-csit
+    jobs:
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "integration-simulators-nf-simulator-netconf-server"
+    recipients: "krzysztof.kuzmicki@nokia.com bogumil.zebek@nokia.com bartosz.gardziejewski@nokia.com"
+    stream:
+      - "master":
+          branch: "master"
+    functionality:
+      - "testsuites":
+          trigger_jobs:
+            - "{project-name}-{stream}-merge-java"
+    robot-options: ""
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
index 8c21bb621..8c0039c51 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml
@@ -1,65 +1,64 @@
 ---
-
 - project:
-      name: integration-simulators-nf-simulator-netconf-server
-      project-name: 'integration-simulators-nf-simulator-netconf-server'
-      python-version: python3.8
-      jobs:
-          - '{project-name}-{stream}-verify-java'
-          - '{project-name}-{stream}-merge-java'
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean install -P docker -DskipDockerPush=false'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-2c-1g
+    name: integration-simulators-nf-simulator-netconf-server
+    project-name: "integration-simulators-nf-simulator-netconf-server"
+    python-version: python3.8
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean install -P docker -DskipDockerPush=false"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: 'integration/simulators/nf-simulator/netconf-server'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
-      # due to a strange macro / variable translation problem this needs
-      # to be passed as a string block to properly get the properties
-      # correctly defined in the job
-      maven-deploy-properties: |
-          deployAtEnd=true
-      files: '**'
-      archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+    project: "integration/simulators/nf-simulator/netconf-server"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-netconf-server-settings"
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
-      name: integration-simulators-nf-simulator-netconf-server-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-docker-8c-8g
-      project: 'integration/simulators/nf-simulator/netconf-server'
-      project-name: 'integration-simulators-nf-simulator-netconf-server'
-      branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-netconf-server-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: integration-simulators-nf-simulator-netconf-server-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-docker-8c-8g
+    project: "integration/simulators/nf-simulator/netconf-server"
+    project-name: "integration-simulators-nf-simulator-netconf-server"
+    branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-netconf-server-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-nf-simulator-netconf-server-view
-      project-name: integration-simulators-nf-simulator-netconf-server
-      views:
-          - project-view
+    name: integration-simulators-nf-simulator-netconf-server-view
+    project-name: integration-simulators-nf-simulator-netconf-server
+    views:
+      - project-view
 
 - project:
-      name: integration-simulators-nf-simulator-netconf-server-info
-      project: integration/simulators/nf-simulator/netconf-server
-      project-name: integration-simulators-nf-simulator-netconf-server
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: integration-simulators-nf-simulator-netconf-server-info
+    project: integration/simulators/nf-simulator/netconf-server
+    project-name: integration-simulators-nf-simulator-netconf-server
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
index ba4c331a2..af4f05a75 100644
--- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml
@@ -1,41 +1,41 @@
 ---
 - project:
-      name: integration-simulators-nf-simulator-simulator-cli
-      project-name: 'integration-simulators-nf-simulator'
-      python-version: python3
-      tox-dir: '.'
-      tox-envs: ''
-      subproject:
-          - simulator-cli:
-                path: './simulator-cli'
-                pattern: '**'
-      project: 'integration/simulators/nf-simulator'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-settings'
-      build-node: ubuntu1804-builder-4c-4g
-      jobs:
-          - '{project-name}-{stream}-{subproject}-verify-python'
+    name: integration-simulators-nf-simulator-simulator-cli
+    project-name: "integration-simulators-nf-simulator"
+    python-version: python3
+    tox-dir: "."
+    tox-envs: ""
+    subproject:
+      - simulator-cli:
+          path: "./simulator-cli"
+          pattern: "**"
+    project: "integration/simulators/nf-simulator"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-settings"
+    build-node: ubuntu1804-builder-4c-4g
+    jobs:
+      - "{project-name}-{stream}-{subproject}-verify-python"
 
 - project:
-      name: integration-simulators-nf-simulator-sonar
-      jobs:
-          - gerrit-tox-sonar
-      cron: '@daily'
-      build-node: ubuntu1804-builder-4c-4g
-      project: 'integration/simulators/nf-simulator'
-      project-name: 'integration-simulators-nf-simulator'
-      branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: integration-simulators-nf-simulator-sonar
+    jobs:
+      - gerrit-tox-sonar
+    cron: "@daily"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "integration/simulators/nf-simulator"
+    project-name: "integration-simulators-nf-simulator"
+    branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-nf-simulator-info
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: 'integration/simulators/nf-simulator'
-      project-name: 'integration-simulators-nf-simulator'
-      branch: 'master'
+    name: integration-simulators-nf-simulator-info
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: "integration/simulators/nf-simulator"
+    project-name: "integration-simulators-nf-simulator"
+    branch: "master"
diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
index 3492b1826..a8ad871ed 100644
--- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
+++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml
@@ -1,65 +1,65 @@
 ---
 - project:
-      name: integration-simulators-nf-simulator-ves-client
-      project-name: 'integration-simulators-nf-simulator-ves-client'
-      java-version: openjdk11
-      jobs:
-          - '{project-name}-{stream}-verify-java'
-          - '{project-name}-{stream}-merge-java'
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                container-public-registry: 'nexus3.onap.org:10001'
-                container-staging-registry: 'nexus3.onap.org:10003'
-                mvn-goals: 'clean deploy -P docker -DskipDockerPush=false'
-          - '{project-name}-gerrit-release-jobs':
-                build-node: centos7-docker-2c-1g
+    name: integration-simulators-nf-simulator-ves-client
+    project-name: "integration-simulators-nf-simulator-ves-client"
+    java-version: openjdk11
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-goals: "clean deploy -P docker -DskipDockerPush=false"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: 'integration/simulators/nf-simulator/ves-client'
-      stream:
-          - 'master':
-                branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
-      # due to a strange macro / variable translation problem this needs
-      # to be passed as a string block to properly get the properties
-      # correctly defined in the job
-      maven-deploy-properties: |
-          deployAtEnd=true
-      files: '**'
-      archive-artifacts: ''
-      build-node: 'ubuntu1804-docker-8c-8g'
+    project: "integration/simulators/nf-simulator/ves-client"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+    # due to a strange macro / variable translation problem this needs
+    # to be passed as a string block to properly get the properties
+    # correctly defined in the job
+    maven-deploy-properties: |
+      deployAtEnd=true
+    files: "**"
+    archive-artifacts: ""
+    build-node: "ubuntu1804-docker-8c-8g"
 
 - project:
-      name: integration-simulators-nf-simulator-ves-client-sonar
-      java-version: openjdk11
-      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-docker-8c-8g
-      project: 'integration/simulators/nf-simulator/ves-client'
-      project-name: 'integration-simulators-nf-simulator-ves-client'
-      branch: 'master'
-      mvn-settings: 'integration-simulators-nf-simulator-ves-client-settings'
-      mvn-goals: 'clean install'
-      mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    name: integration-simulators-nf-simulator-ves-client-sonar
+    java-version: openjdk11
+    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-docker-8c-8g
+    project: "integration/simulators/nf-simulator/ves-client"
+    project-name: "integration-simulators-nf-simulator-ves-client"
+    branch: "master"
+    mvn-settings: "integration-simulators-nf-simulator-ves-client-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: integration-simulators-nf-simulator-ves-client-view
-      project-name: integration-simulators-nf-simulator-ves-client
-      views:
-          - project-view
+    name: integration-simulators-nf-simulator-ves-client-view
+    project-name: integration-simulators-nf-simulator-ves-client
+    views:
+      - project-view
 
 - project:
-      name: integration-simulators-nf-simulator-ves-client-info
-      project: integration/simulators/nf-simulator/ves-client
-      project-name: integration-simulators-nf-simulator-ves-client
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: integration-simulators-nf-simulator-ves-client-info
+    project: integration/simulators/nf-simulator/ves-client
+    project-name: integration-simulators-nf-simulator-ves-client
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
index bab397e6b..68806f2cf 100644
--- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
+++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml
@@ -15,26 +15,26 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
index d7f43cdff..aa3c77ba1 100644
--- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
+++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml
@@ -1,5 +1,4 @@
 ---
-
 - project:
     name: integration-usecases-A1-policy-enforcement-info
     project: integration/usecases/A1-policy-enforcement
@@ -16,26 +15,26 @@
     jobs:
       - integration-linters
     subproject:
-      - 'yaml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yaml'
-      - 'yml':
-          tox-dir: '.'
-          tox-envs: 'yaml'
-          pattern: '**/*.yml'
-      - 'json':
-          tox-dir: '.'
-          tox-envs: 'json'
-          pattern: '**/*.json'
-      - 'python':
-          tox-dir: '.'
-          tox-envs: 'py'
-          pattern: '**/*.py'
-      - 'md':
-          tox-dir: '.'
-          tox-envs: 'md'
-          pattern: '**/*.md'
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "python":
+          tox-dir: "."
+          tox-envs: "py"
+          pattern: "**/*.py"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
     stream:
-      - 'master':
-          branch: 'master'
+      - "master":
+          branch: "master"
diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml
index b87942e67..575fa19e6 100644
--- a/jjb/integration/xtesting/integration-xtesting.yaml
+++ b/jjb/integration/xtesting/integration-xtesting.yaml
@@ -9,126 +9,126 @@
     branch: master
 
 - project:
-      name: integration-xtesting-linters
-      project: integration/xtesting
-      project-name: integration-xtesting
-      python-version: python3
-      jobs:
-          - integration-linters
-      subproject:
-          - 'commit':
-                tox-dir: '.'
-                tox-envs: 'gitlint'
-                pattern: '**'
-          - 'yaml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yaml'
-          - 'yml':
-                tox-dir: '.'
-                tox-envs: 'yaml'
-                pattern: '**/*.yml'
-          - 'json':
-                tox-dir: '.'
-                tox-envs: 'json'
-                pattern: '**/*.json'
-          - 'md':
-              tox-dir: '.'
-              tox-envs: 'md'
-              pattern: '**/*.md'
-      stream:
-          - 'master':
-                branch: 'master'
-          - 'jakarta':
-                branch: 'jakarta'
-          - 'kohn':
-                branch: 'kohn'
+    name: integration-xtesting-linters
+    project: integration/xtesting
+    project-name: integration-xtesting
+    python-version: python3
+    jobs:
+      - integration-linters
+    subproject:
+      - "commit":
+          tox-dir: "."
+          tox-envs: "gitlint"
+          pattern: "**"
+      - "yaml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yaml"
+      - "yml":
+          tox-dir: "."
+          tox-envs: "yaml"
+          pattern: "**/*.yml"
+      - "json":
+          tox-dir: "."
+          tox-envs: "json"
+          pattern: "**/*.json"
+      - "md":
+          tox-dir: "."
+          tox-envs: "md"
+          pattern: "**/*.md"
+    stream:
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
 
 - project:
     name: integration-xtesting-release
-    project-name: 'integration-xtesting'
-    project: 'integration/xtesting'
-    mvn-settings: 'integration-settings'
+    project-name: "integration-xtesting"
+    project: "integration/xtesting"
+    mvn-settings: "integration-settings"
     jobs:
-      - '{project-name}-gerrit-release-jobs':
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
 - project:
-    name: 'integration-xtesting-docker'
+    name: "integration-xtesting-docker"
     jobs:
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-infra-healthcheck'
+          project-name: "integration-xtesting-infra-healthcheck"
           docker-root: ./infra-healthcheck
-          docker-name: 'onap/xtesting-infra-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-infra-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-infra-healthcheck'
+          project-name: "integration-xtesting-infra-healthcheck"
           docker-root: ./infra-healthcheck
-          docker-name: 'onap/xtesting-infra-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-infra-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-healthcheck'
+          project-name: "integration-xtesting-healthcheck"
           docker-root: ./healthcheck
-          docker-name: 'onap/xtesting-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-healthcheck'
+          project-name: "integration-xtesting-healthcheck"
           docker-root: ./healthcheck
-          docker-name: 'onap/xtesting-healthcheck'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-healthcheck"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+          project-name: "integration-xtesting-smoke-usecases-pythonsdk"
           docker-root: ./smoke-usecases-pythonsdk
-          docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-pythonsdk"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-smoke-usecases-pythonsdk'
+          project-name: "integration-xtesting-smoke-usecases-pythonsdk"
           docker-root: ./smoke-usecases-pythonsdk
-          docker-name: 'onap/xtesting-smoke-usecases-pythonsdk'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-pythonsdk"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-smoke-usecases-robot'
+          project-name: "integration-xtesting-smoke-usecases-robot"
           docker-root: ./smoke-usecases-robot
-          docker-name: 'onap/xtesting-smoke-usecases-robot'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-robot"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-smoke-usecases-robot'
+          project-name: "integration-xtesting-smoke-usecases-robot"
           docker-root: ./smoke-usecases-robot
-          docker-name: 'onap/xtesting-smoke-usecases-robot'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-robot"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-security'
+          project-name: "integration-xtesting-security"
           docker-root: ./security
-          docker-name: 'onap/xtesting-security'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-security"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-security'
+          project-name: "integration-xtesting-security"
           docker-root: ./security
-          docker-name: 'onap/xtesting-security'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-security"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-verify:
-          project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+          project-name: "integration-xtesting-smoke-usecases-robot-py3"
           docker-root: ./smoke-usecases-robot-py3
-          docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
-          docker-build-args: '-f ./docker/Dockerfile'
+          docker-name: "onap/xtesting-smoke-usecases-robot-py3"
+          docker-build-args: "-f ./docker/Dockerfile"
       - gerrit-docker-merge:
-          project-name: 'integration-xtesting-smoke-usecases-robot-py3'
+          project-name: "integration-xtesting-smoke-usecases-robot-py3"
           docker-root: ./smoke-usecases-robot-py3
-          docker-name: 'onap/xtesting-smoke-usecases-robot-py3'
-          docker-build-args: '-f ./docker/Dockerfile'
-    project: 'integration/xtesting'
+          docker-name: "onap/xtesting-smoke-usecases-robot-py3"
+          docker-build-args: "-f ./docker/Dockerfile"
+    project: "integration/xtesting"
     stream:
-      - 'master':
-            branch: 'master'
-            files: ''
-      - 'jakarta':
-            branch: 'jakarta'
-            files: ''
-      - 'kohn':
-            branch: 'kohn'
-            files: ''
-    docker-root: '$WORKSPACE'
-    mvn-settings: 'integration-settings'
+      - "master":
+          branch: "master"
+          files: ""
+      - "jakarta":
+          branch: "jakarta"
+          files: ""
+      - "kohn":
+          branch: "kohn"
+          files: ""
+    docker-root: "$WORKSPACE"
+    mvn-settings: "integration-settings"
     build-node: ubuntu1804-docker-8c-8g
-    cron: '@daily'
+    cron: "@daily"
     container-tag-method: stream