From: Andrew Grimberg <agrimberg@linuxfoundation.org>
Date: Wed, 3 May 2023 16:47:36 +0000 (-0700)
Subject: Refactor: Cleanup for pre-commit
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=86af1067030c622c32ebfa0246482bd69ba45411;p=ci-management.git

Refactor: Cleanup for pre-commit

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

diff --git a/jjb/ci-management/ci-management-coverity.yaml b/jjb/ci-management/ci-management-coverity.yaml
index ff822ba9b..3eac4795f 100644
--- a/jjb/ci-management/ci-management-coverity.yaml
+++ b/jjb/ci-management/ci-management-coverity.yaml
@@ -2,152 +2,152 @@
 # Coverity Scan static analysis
 
 - job-template:
-      name: "{project-name}-coverity"
-      id: onap-gerrit-maven-coverity
-      description: >
-          <hr/>
-          <h2>How to access Coverity Scan static analysis results</h2>
+    name: "{project-name}-coverity"
+    id: onap-gerrit-maven-coverity
+    description: >
+      <hr/>
+      <h2>How to access Coverity Scan static analysis results</h2>
+      <ol>
+        <li>Visit <a href="https://scan.coverity.com/projects/{coverity-project-name}">Coverity Scan
+          project page</a>.</li>
+        <li>If you have not been added to the project on Coverity Scan service yet:
           <ol>
-            <li>Visit <a href="https://scan.coverity.com/projects/{coverity-project-name}">Coverity Scan
-              project page</a>.</li>
-            <li>If you have not been added to the project on Coverity Scan service yet:
-              <ol>
-                <li>Click on <a href="https://scan.coverity.com/memberships/new?project_id={coverity-project-name}">
-                  Add me to project</a>.</li>
-                <li>Wait till the project administrators grant you appropriate permissions.</li>
-              </ol>
-            <li>Click on <a href="https://scan.coverity.com/projects/{coverity-project-name}/view_defects">
-              View Defects</a>.</li>
+            <li>Click on <a href="https://scan.coverity.com/memberships/new?project_id={coverity-project-name}">
+              Add me to project</a>.</li>
+            <li>Wait till the project administrators grant you appropriate permissions.</li>
           </ol>
-          <p>Please note that processing data takes some time. You will get an email when it's done.</p>
-          <p>See more <a href="https://wiki.onap.org/x/Y6vQAw">Coverity Scan HOWTOs</a> on ONAP Developer Wiki.</p>
-          <hr/>
+        <li>Click on <a href="https://scan.coverity.com/projects/{coverity-project-name}/view_defects">
+          View Defects</a>.</li>
+      </ol>
+      <p>Please note that processing data takes some time. You will get an email when it's done.</p>
+      <p>See more <a href="https://wiki.onap.org/x/Y6vQAw">Coverity Scan HOWTOs</a> on ONAP Developer Wiki.</p>
+      <hr/>
 
-      project-type: freestyle
-      node: "{build-node}"
-      branch: master
-      build-days-to-keep: 7
-      build-timeout: 240
-      cron: "@daily"
-      disabled: false
-      dry-run: false
-      git-url: "$GIT_URL/$PROJECT"
-      java-version: openjdk8
-      mvn-global-settings: global-settings
-      mvn-opts: ""
-      mvn-params: ""
-      mvn-version: mvn35
-      coverity-project-name: ""
-      coverity-token: ""
-      coverity-user-email: ""
-      coverity-search-paths: ""
-      coverity-search-exclude-regexs: ""
-      max-git-repo-age-hours: 0
-      stream: master
-      submodule-recursive: true
-      submodule-timeout: 10
-      submodule-disable: false
-      archive-artifacts: >
-          cov-int/BUILD.metrics.xml
-          cov-int/build-log.txt
-          cov-int/build-timings.txt
-          cov-int/cov-import-scm-timings.txt
-          cov-int/coverity-scan-analysed-files.txt
-          cov-int/scm-untracked-files.txt
-          cov-int/failed_jsp/*
-          cov-int/java-security-da-input.dat
-          cov-int/java-security-da-whitelist.dat
-          cov-int/jsp-compilation-log.txt
-          cov-int/jsp-debug-log.txt
-          cov-int/security.log
+    project-type: freestyle
+    node: "{build-node}"
+    branch: master
+    build-days-to-keep: 7
+    build-timeout: 240
+    cron: "@daily"
+    disabled: false
+    dry-run: false
+    git-url: "$GIT_URL/$PROJECT"
+    java-version: openjdk8
+    mvn-global-settings: global-settings
+    mvn-opts: ""
+    mvn-params: ""
+    mvn-version: mvn35
+    coverity-project-name: ""
+    coverity-token: ""
+    coverity-user-email: ""
+    coverity-search-paths: ""
+    coverity-search-exclude-regexs: ""
+    max-git-repo-age-hours: 0
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+    archive-artifacts: >
+      cov-int/BUILD.metrics.xml
+      cov-int/build-log.txt
+      cov-int/build-timings.txt
+      cov-int/cov-import-scm-timings.txt
+      cov-int/coverity-scan-analysed-files.txt
+      cov-int/scm-untracked-files.txt
+      cov-int/failed_jsp/*
+      cov-int/java-security-da-input.dat
+      cov-int/java-security-da-whitelist.dat
+      cov-int/jsp-compilation-log.txt
+      cov-int/jsp-debug-log.txt
+      cov-int/security.log
 
-      properties:
-          - lf-infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
 
-      parameters:
-          - lf-infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                stream: "{stream}"
-          - lf-infra-maven-parameters:
-                mvn-opts: "{mvn-opts}"
-                mvn-params: "{mvn-params}"
-                mvn-version: "{mvn-version}"
-          - string:
-                name: ARCHIVE_ARTIFACTS
-                default: "{archive-artifacts}"
-                description: Artifacts to archive to the logs server.
-          - string:
-                name: SEARCH_PATHS
-                default: "{coverity-search-paths}"
-                description: >
-                    Additional directories to search for files to analyse by Coverity
-                    Scan service (space separated).
-          - string:
-                name: SEARCH_EXCLUDE_REGEXS
-                default: "{coverity-search-exclude-regexs}"
-                description: >
-                    File path patterns to exclude from analysis by Coverity Scan
-                    service (e.g. 3rd-party or auto-generated sources, space
-                    separated).
-          - string:
-                name: COVERITY_USER_EMAIL
-                default: "{coverity-user-email}"
-                description: >
-                    E-mail address to receive analysis status report after submittion.
-                    It must be a registered user on Coverity Scan service added as a
-                    member to appropriate Coverity Scan project with "Maintainer/Owner"
-                    role.
-          - bool:
-                name: DRY_RUN
-                default: "{dry-run}"
-                description: Do not submit results to Coverity Scan server at the end of the build.
-          - string:
-                name: "MAX_GIT_REPO_AGE_HOURS"
-                default: "{max-git-repo-age-hours}"
-                description: >
-                    If set to non-zero run the code scan only if there were no git
-                    repository commits last MAX_GIT_REPO_AGE_HOURS hours.
-                    It makes sense to set the value twice the 'cron' interval for the
-                    job (e.g. if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48)
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
+      - lf-infra-maven-parameters:
+          mvn-opts: "{mvn-opts}"
+          mvn-params: "{mvn-params}"
+          mvn-version: "{mvn-version}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: "{archive-artifacts}"
+          description: Artifacts to archive to the logs server.
+      - string:
+          name: SEARCH_PATHS
+          default: "{coverity-search-paths}"
+          description: >
+            Additional directories to search for files to analyse by Coverity
+            Scan service (space separated).
+      - string:
+          name: SEARCH_EXCLUDE_REGEXS
+          default: "{coverity-search-exclude-regexs}"
+          description: >
+            File path patterns to exclude from analysis by Coverity Scan
+            service (e.g. 3rd-party or auto-generated sources, space
+            separated).
+      - string:
+          name: COVERITY_USER_EMAIL
+          default: "{coverity-user-email}"
+          description: >
+            E-mail address to receive analysis status report after submittion.
+            It must be a registered user on Coverity Scan service added as a
+            member to appropriate Coverity Scan project with "Maintainer/Owner"
+            role.
+      - bool:
+          name: DRY_RUN
+          default: "{dry-run}"
+          description: Do not submit results to Coverity Scan server at the end of the build.
+      - string:
+          name: "MAX_GIT_REPO_AGE_HOURS"
+          default: "{max-git-repo-age-hours}"
+          description: >
+            If set to non-zero run the code scan only if there were no git
+            repository commits last MAX_GIT_REPO_AGE_HOURS hours.
+            It makes sense to set the value twice the 'cron' interval for the
+            job (e.g. if 'cron: @daily', then MAX_GIT_REPO_AGE_HOURS=48)
 
-      triggers:
-          - timed: "{obj:cron}"
+    triggers:
+      - timed: "{obj:cron}"
 
-      wrappers:
-          - lf-infra-wrappers:
-                build-timeout: "{build-timeout}"
-                jenkins-ssh-credential: "{jenkins-ssh-credential}"
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
-      builders:
-          - lf-infra-pre-build
-          - lf-maven-install:
-                mvn-version: "{mvn-version}"
-          - lf-update-java-alternatives:
-                java-version: "{java-version}"
-          - lf-provide-maven-settings:
-                global-settings-file: global-settings
-                settings-file: "{mvn-settings}"
-          - inject:
-                properties-content: |
-                    COVERITY_PROJECT_NAME={coverity-project-name}
-                    COVERITY_TOKEN={coverity-token}
-          - shell: !include-raw-escape:
-                - ../../global-jjb/shell/common-variables.sh
-                - ../../shell/maven-coverity.sh
-          - lf-provide-maven-settings-cleanup
+    builders:
+      - lf-infra-pre-build
+      - lf-maven-install:
+          mvn-version: "{mvn-version}"
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - lf-provide-maven-settings:
+          global-settings-file: global-settings
+          settings-file: "{mvn-settings}"
+      - inject:
+          properties-content: |
+            COVERITY_PROJECT_NAME={coverity-project-name}
+            COVERITY_TOKEN={coverity-token}
+      - shell: !include-raw-escape:
+          - ../../global-jjb/shell/common-variables.sh
+          - ../../shell/maven-coverity.sh
+      - lf-provide-maven-settings-cleanup
 
-      publishers:
-          - lf-infra-publish
+    publishers:
+      - lf-infra-publish
 
-      scm:
-          - lf-infra-gerrit-scm:
-                jenkins-ssh-credential: "{jenkins-ssh-credential}"
-                git-url: "{git-url}"
-                refspec: $GERRIT_REFSPEC
-                branch: $GERRIT_BRANCH
-                submodule-recursive: "{submodule-recursive}"
-                submodule-timeout: "{submodule-timeout}"
-                submodule-disable: "{submodule-disable}"
-                choosing-strategy: default
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "{git-url}"
+          refspec: $GERRIT_REFSPEC
+          branch: $GERRIT_BRANCH
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml
index aa367dfa6..41849503c 100644
--- a/jjb/ci-management/ci-management-packer-jobs.yaml
+++ b/jjb/ci-management/ci-management-packer-jobs.yaml
@@ -1,98 +1,98 @@
 ---
 - project:
-      name: packer-builder-jobs
-      jobs:
-          - gerrit-packer-merge
-          - gerrit-packer-verify-build
-
-      project: ci-management
-      project-name: ci-management
-      branch: master
-      archive-artifacts: "**/*.log"
-
-      build-node: centos8-builder-2c-1g
-      build-timeout: 90
-
-      platforms:
-          - centos-cs-8
-          - ubuntu-18.04
-          - ubuntu-20.04
-      templates: builder
-      update-cloud-image: true
+    name: packer-builder-jobs
+    jobs:
+      - gerrit-packer-merge
+      - gerrit-packer-verify-build
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: "**/*.log"
+
+    build-node: centos8-builder-2c-1g
+    build-timeout: 90
+
+    platforms:
+      - centos-cs-8
+      - ubuntu-18.04
+      - ubuntu-20.04
+    templates: builder
+    update-cloud-image: true
 
 - project:
-      name: packer-docker-jobs
-      jobs:
-          - gerrit-packer-merge
-          - gerrit-packer-verify-build
-
-      project: ci-management
-      project-name: ci-management
-      branch: master
-      archive-artifacts: "**/*.log"
-
-      build-node: centos8-builder-2c-1g
-      build-timeout: 90
-
-      platforms:
-          - centos-7
-          - centos-cs-8
-          - ubuntu-18.04
-          - ubuntu-20.04
-      templates: docker
-      update-cloud-image: true
+    name: packer-docker-jobs
+    jobs:
+      - gerrit-packer-merge
+      - gerrit-packer-verify-build
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: "**/*.log"
+
+    build-node: centos8-builder-2c-1g
+    build-timeout: 90
+
+    platforms:
+      - centos-7
+      - centos-cs-8
+      - ubuntu-18.04
+      - ubuntu-20.04
+    templates: docker
+    update-cloud-image: true
 
 - project:
-      name: packer-memcached-jobs
-      jobs:
-          - gerrit-packer-merge
-          - gerrit-packer-verify-build
+    name: packer-memcached-jobs
+    jobs:
+      - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
-      project: ci-management
-      project-name: ci-management
-      branch: master
-      archive-artifacts: "**/*.log"
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: "**/*.log"
 
-      build-node: centos8-builder-2c-1g
-      build-timeout: 90
+    build-node: centos8-builder-2c-1g
+    build-timeout: 90
 
-      platforms:
-          - ubuntu-20.04
-      templates: memcached
-      update-cloud-image: true
+    platforms:
+      - ubuntu-20.04
+    templates: memcached
+    update-cloud-image: true
 
 - project:
-      name: packer-redis-jobs
-      jobs:
-          - gerrit-packer-merge
-          - gerrit-packer-verify-build
+    name: packer-redis-jobs
+    jobs:
+      - gerrit-packer-merge
+      - gerrit-packer-verify-build
 
-      project: ci-management
-      project-name: ci-management
-      branch: master
-      archive-artifacts: "**/*.log"
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: "**/*.log"
 
-      build-node: centos8-builder-2c-1g
+    build-node: centos8-builder-2c-1g
 
-      platforms:
-          - centos-cs-8
-      templates: redis
-      update-cloud-image: true
+    platforms:
+      - centos-cs-8
+    templates: redis
+    update-cloud-image: true
 
 - project:
-      name: packer-helm-jobs
-      jobs:
-          - gerrit-packer-merge
-          - gerrit-packer-verify-build
-
-      project: ci-management
-      project-name: ci-management
-      branch: master
-      archive-artifacts: "**/*.log"
-
-      build-node: centos8-builder-2c-1g
-
-      platforms:
-          - ubuntu-20.04
-      templates: helm
-      update-cloud-image: true
+    name: packer-helm-jobs
+    jobs:
+      - gerrit-packer-merge
+      - gerrit-packer-verify-build
+
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: "**/*.log"
+
+    build-node: centos8-builder-2c-1g
+
+    platforms:
+      - ubuntu-20.04
+    templates: helm
+    update-cloud-image: true
diff --git a/jjb/ci-management/ci-management-views.yaml b/jjb/ci-management/ci-management-views.yaml
index 6ba346007..2a3e474ea 100644
--- a/jjb/ci-management/ci-management-views.yaml
+++ b/jjb/ci-management/ci-management-views.yaml
@@ -1,140 +1,140 @@
 ---
 - _releng_view: &releng_view_common
-      name: releng-view-common
-      view-type: list
-      filter-executors: false
-      filter-queue: false
-      columns:
-          - status
-          - weather
-          - job
-          - last-success
-          - last-failure
-          - last-duration
-          - build-button
-          - jacoco
-          - find-bugs
-          - robot-list
-      recurse: false
+    name: releng-view-common
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - jacoco
+      - find-bugs
+      - robot-list
+    recurse: false
 
 - project:
-      name: "00-Empty View"
-      views:
-          - common-view
-      view-name: "00-Empty View"
-      view-description: >
-          Empty job view. This is used as the default landing view to keep the
-          Jenkins UI responding better while a) under high load and b) when there
-          are a lot of jobs defined in the system
-      view-regex: ""
+    name: "00-Empty View"
+    views:
+      - common-view
+    view-name: "00-Empty View"
+    view-description: >
+      Empty job view. This is used as the default landing view to keep the
+      Jenkins UI responding better while a) under high load and b) when there
+      are a lot of jobs defined in the system
+    view-regex: ""
 
 - view:
-      name: 01-Recent
-      regex: ".*"
-      description: "List of most recent jobs"
-      job-filters:
-          most-recent:
-              max-to-include: 25
-              check-start-time: true
-      <<: *releng_view_common
+    name: 01-Recent
+    regex: ".*"
+    description: "List of most recent jobs"
+    job-filters:
+      most-recent:
+        max-to-include: 25
+        check-start-time: true
+    <<: *releng_view_common
 
 - project:
-      name: All-Sonar
-      views:
-          - common-view
-      view-name: All-Sonar
-      view-regex: "^(?=.*-sonar)(?!.*-no-sonar).*"
-      view-description: "List of Sonar jobs"
+    name: All-Sonar
+    views:
+      - common-view
+    view-name: All-Sonar
+    view-regex: "^(?=.*-sonar)(?!.*-no-sonar).*"
+    view-description: "List of Sonar jobs"
 
 - project:
-      name: All-Coverity
-      views:
-          - common-view
-      view-name: All-Coverity
-      view-regex: ".*-coverity"
-      view-description: >
-          <h1>List of Coverity Scan static code analysis jobs</h1>
-          <p>See <a href="https://wiki.onap.org/x/Y6vQAw">how to add your component to Coverity Scan</a>
-          on ONAP Developer Wiki.</p>
+    name: All-Coverity
+    views:
+      - common-view
+    view-name: All-Coverity
+    view-regex: ".*-coverity"
+    view-description: >
+      <h1>List of Coverity Scan static code analysis jobs</h1>
+      <p>See <a href="https://wiki.onap.org/x/Y6vQAw">how to add your component to Coverity Scan</a>
+      on ONAP Developer Wiki.</p>
 
 - view:
-      name: CLM
-      description: "List of CLM jobs"
-      regex: ".*-clm-.*"
-      view-type: list
-      filter-executors: false
-      filter-queue: false
-      columns:
-          - status
-          - weather
-          - job
-          - last-success
-          - last-failure
-          - last-duration
-          - build-button
-          - policy-violations
-      recurse: false
+    name: CLM
+    description: "List of CLM jobs"
+    regex: ".*-clm-.*"
+    view-type: list
+    filter-executors: false
+    filter-queue: false
+    columns:
+      - status
+      - weather
+      - job
+      - last-success
+      - last-failure
+      - last-duration
+      - build-button
+      - policy-violations
+    recurse: false
 
 - project:
-      name: CSIT
-      views:
-          - csit-view
-      view-name: CSIT
-      view-description: "List of CSIT jobs"
-      view-regex: "^(?=.*-csit-.*)(?!.*-verify-csit.*).*"
+    name: CSIT
+    views:
+      - csit-view
+    view-name: CSIT
+    view-description: "List of CSIT jobs"
+    view-regex: "^(?=.*-csit-.*)(?!.*-verify-csit.*).*"
 
 - project:
-      name: CSIT-Verify
-      views:
-          - csit-view
-      view-name: CSIT-Verify
-      view-description: "List of CSIT Verify jobs"
-      view-regex: "^.*-verify-csit.*"
+    name: CSIT-Verify
+    views:
+      - csit-view
+    view-name: CSIT-Verify
+    view-description: "List of CSIT Verify jobs"
+    view-regex: "^.*-verify-csit.*"
 
 - view:
-      name: Daily-Jobs
-      views:
-          - common-view
-      view-name: Daily-Jobs
-      view-description: "List of Daily Jobs"
-      view-regex: ".*-daily"
+    name: Daily-Jobs
+    views:
+      - common-view
+    view-name: Daily-Jobs
+    view-description: "List of Daily Jobs"
+    view-regex: ".*-daily"
 
 - view:
-      name: External-Labs
-      views:
-          - common-view
-      view-name: External-Labs
-      view-description: "List of External Labs jobs"
-      view-regex: "^lab-.*"
+    name: External-Labs
+    views:
+      - common-view
+    view-name: External-Labs
+    view-description: "List of External Labs jobs"
+    view-regex: "^lab-.*"
 
 - project:
-      name: Merge-Jobs
-      views:
-          - common-view
-      view-name: Merge-Jobs
-      view-description: "List of Merge jobs"
-      view-regex: ".*-merge-.*"
+    name: Merge-Jobs
+    views:
+      - common-view
+    view-name: Merge-Jobs
+    view-description: "List of Merge jobs"
+    view-regex: ".*-merge-.*"
 
 - project:
-      name: Thirdparty
-      views:
-          - common-view
-      view-name: Thirdparty
-      view-description: "List of Nexus Thirdparty dependencies jobs"
-      view-regex: ".*-thirdparty-.*"
+    name: Thirdparty
+    views:
+      - common-view
+    view-name: Thirdparty
+    view-description: "List of Nexus Thirdparty dependencies jobs"
+    view-regex: ".*-thirdparty-.*"
 
 - project:
-      name: Verify-Jobs
-      views:
-          - common-view
-      view-name: Verify-Jobs
-      view-description: "List of Verify jobs"
-      view-regex: "^.*-verify-.*"
+    name: Verify-Jobs
+    views:
+      - common-view
+    view-name: Verify-Jobs
+    view-description: "List of Verify jobs"
+    view-regex: "^.*-verify-.*"
 
 - project:
-      name: Release-Jobs
-      views:
-          - common-view
-      view-name: Release-Jobs
-      view-description: "List of Release Merge jobs"
-      view-regex: ".*release-merge.*"
+    name: Release-Jobs
+    views:
+      - common-view
+    view-name: Release-Jobs
+    view-description: "List of Release Merge jobs"
+    view-regex: ".*release-merge.*"
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 5fb7aa2a8..6818dbd6b 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -1,70 +1,70 @@
 ---
 - project:
-      name: ci-management-project-view
-      project-name: ci-management
-      views:
-          - project-view
+    name: ci-management-project-view
+    project-name: ci-management
+    views:
+      - project-view
 
 - project:
-      name: ci-management-info
-      project-name: ci-management
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: ci-management
-      branch: master
+    name: ci-management-info
+    project-name: ci-management
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: ci-management
+    branch: master
 
 - project:
-      name: ci-management-jobs
-      jobs:
-          - gerrit-jenkins-cfg-verify
-          - gerrit-jenkins-sandbox-cleanup
-          - gerrit-jjb-deploy-job
-          - gerrit-jjb-merge
-          - gerrit-jjb-verify
-          - gerrit-packer-verify
+    name: ci-management-jobs
+    jobs:
+      - gerrit-jenkins-cfg-verify
+      - gerrit-jenkins-sandbox-cleanup
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge
+      - gerrit-jjb-verify
+      - gerrit-packer-verify
 
-      project: "ci-management"
-      project-name: "ci-management"
-      archive-artifacts: "**/*.log"
-      branch: "master"
-      build-timeout: "60"
-      build-node: "centos8-builder-2c-1g"
-      jjb-version: 4.1.0
-      # configure the gerrit-jjb-verify job
-      build-node-label-check: true
-      build-node-label-list: ""
+    project: "ci-management"
+    project-name: "ci-management"
+    archive-artifacts: "**/*.log"
+    branch: "master"
+    build-timeout: "60"
+    build-node: "centos8-builder-2c-1g"
+    jjb-version: 4.1.0
+    # configure the gerrit-jjb-verify job
+    build-node-label-check: true
+    build-node-label-list: ""
 
 - project:
-      name: builder-openstack
-      jobs:
-          - gerrit-openstack-cron
+    name: builder-openstack
+    jobs:
+      - gerrit-openstack-cron
 
-      project: ci-management
-      project-name: ci-management
-      build-node: centos8-builder-2c-1g
+    project: ci-management
+    project-name: ci-management
+    build-node: centos8-builder-2c-1g
 
-      jenkins-urls: >
-          https://jenkins.onap.org
-          https://jenkins.onap.org/sandbox
-      openstack-cloud: vex
+    jenkins-urls: >
+      https://jenkins.onap.org
+      https://jenkins.onap.org/sandbox
+    openstack-cloud: vex
 
 - project:
-      name: openstack-update-cloud-images
-      jobs:
-          - gerrit-openstack-update-cloud-image
+    name: openstack-update-cloud-images
+    jobs:
+      - gerrit-openstack-update-cloud-image
 
-      project: ci-management
-      project-name: ci-management
-      branch: master
-      archive-artifacts: "**/*.log"
-      jenkins-ssh-credential: onap-jenkins-ssh
+    project: ci-management
+    project-name: ci-management
+    branch: master
+    archive-artifacts: "**/*.log"
+    jenkins-ssh-credential: onap-jenkins-ssh
 
-      build-node: centos8-builder-2c-1g
-      # update-cloud-image: true
-      build-timeout: 10
+    build-node: centos8-builder-2c-1g
+    # update-cloud-image: true
+    build-timeout: 10
 
-      gerrit-user: "jenkins-$SILO"
-      gerrit-host: "gerrit.onap.org"
-      gerrit-topic: "update-cloud-image"
-      reviewers-email: "onap-jobbuilder@jenkins.onap.org"
+    gerrit-user: "jenkins-$SILO"
+    gerrit-host: "gerrit.onap.org"
+    gerrit-topic: "update-cloud-image"
+    reviewers-email: "onap-jobbuilder@jenkins.onap.org"
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index e4f140fd6..47d29e83c 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -1,100 +1,100 @@
 ---
 - project:
-      name: cli-project-view
-      project-name: cli
-      views:
-          - project-view
+    name: cli-project-view
+    project-name: cli
+    views:
+      - project-view
 
 - project:
-      name: cli
-      java-version: openjdk11
-      project-name: "cli"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                # yamllint disable-line rule:line-length
-                mvn-params: "-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003"
-                container-public-registry: "nexus3.onap.org:10001"
-                container-staging-registry: "nexus3.onap.org:10003"
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-          - "{project-name}-{stream}-aai-docker-java-daily":
-                pom: "deployment/docker/pom.xml"
-                mvn-goals: "docker:build"
-                docker-image-name: "onap/cli"
-                build-node: ubuntu1804-docker-8c-8g
-      project: "cli"
-      stream:
-          - "master":
-                branch: "master"
-                java-version: openjdk11
-      mvn-settings: "cli-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: cli
+    java-version: openjdk11
+    project-name: "cli"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          # yamllint disable-line rule:line-length
+          mvn-params: "-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+      - "{project-name}-{stream}-aai-docker-java-daily":
+          pom: "deployment/docker/pom.xml"
+          mvn-goals: "docker:build"
+          docker-image-name: "onap/cli"
+          build-node: ubuntu1804-docker-8c-8g
+    project: "cli"
+    stream:
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    mvn-settings: "cli-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: cli-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-builder-4c-4g
-      project: "cli"
-      project-name: "cli"
-      branch: "master"
-      mvn-settings: "cli-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cli-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-builder-4c-4g
+    project: "cli"
+    project-name: "cli"
+    branch: "master"
+    mvn-settings: "cli-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: cli-clm
-      java-version: openjdk11
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: "cli"
-      project-name: "cli"
-      branch: "master"
-      mvn-settings: "cli-settings"
-      build-node: ubuntu1804-builder-4c-4g
+    name: cli-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: "cli"
+    project-name: "cli"
+    branch: "master"
+    mvn-settings: "cli-settings"
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: cli-info
-      project-name: cli
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: cli
-      branch: master
+    name: cli-info
+    project-name: cli
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: cli
+    branch: master
 
 - project:
-      name: cli-sonar-verify
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-sonar-verify
-      sonarcloud: true
-      sonarcloud-project-organization: "{sonarcloud_project_organization}"
-      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-      sonar-mvn-goal: "{sonar_mvn_goal}"
-      build-node: ubuntu1804-docker-8c-8g
-      project: "cli"
-      project-name: "cli"
-      branch: "master"
-      mvn-settings: "cli-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cli-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: ubuntu1804-docker-8c-8g
+    project: "cli"
+    project-name: "cli"
+    branch: "master"
+    mvn-settings: "cli-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml
index de65d8211..dbc44aaee 100644
--- a/jjb/cps/cps-cps-tbdmt.yaml
+++ b/jjb/cps/cps-cps-tbdmt.yaml
@@ -1,101 +1,101 @@
 ---
 - project:
-      name: cps-tbdmt-project-view
-      project-name: cps-cps-tbdmt
-      views:
-          - project-view
+    name: cps-tbdmt-project-view
+    project-name: cps-cps-tbdmt
+    views:
+      - project-view
 
 - project:
-      name: cps-tbdmt-info
-      project: cps/cps-tbdmt
-      project-name: cps-cps-tbdmt
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: cps-tbdmt-info
+    project: cps/cps-tbdmt
+    project-name: cps-cps-tbdmt
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
 
 - project:
-      name: cps-tbdmt-clm
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: cps/cps-tbdmt
-      project-name: cps-cps-tbdmt
-      branch: "master"
-      mvn-settings: "cps-cps-tbdmt-settings"
-      build-node: centos8-docker-8c-8g
+    name: cps-tbdmt-clm
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: cps/cps-tbdmt
+    project-name: cps-cps-tbdmt
+    branch: "master"
+    mvn-settings: "cps-cps-tbdmt-settings"
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-tbdmt
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      project-name: cps-cps-tbdmt
-      project: cps/cps-tbdmt
-      mvn-snapshot-id: "ecomp-snapshots"
-      nexus-snapshot-repo: "snapshots"
-      jobs:
-          - gerrit-maven-verify:
-                mvn-goals: "clean install"
-          - gerrit-maven-merge
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-params: "-P docker"
-                container-public-registry: "nexus3.onap.org:10001"
-                container-staging-registry: "nexus3.onap.org:10003"
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "cps-cps-tbdmt-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: centos8-docker-8c-8g
+    name: cps-tbdmt
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    project-name: cps-cps-tbdmt
+    project: cps/cps-tbdmt
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    jobs:
+      - gerrit-maven-verify:
+          mvn-goals: "clean install"
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: "-P docker"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "cps-cps-tbdmt-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-tbdmt-sonar
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      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: centos8-docker-8c-8g
-      project: "cps/cps-tbdmt"
-      project-name: "cps-cps-tbdmt"
-      branch: "master"
-      mvn-settings: "cps-cps-tbdmt-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-tbdmt-sonar
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    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: centos8-docker-8c-8g
+    project: "cps/cps-tbdmt"
+    project-name: "cps-cps-tbdmt"
+    branch: "master"
+    mvn-settings: "cps-cps-tbdmt-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: cps-tbdmt-sonar-verify
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-sonar-verify
-      sonarcloud: true
-      sonarcloud-project-organization: "{sonarcloud_project_organization}"
-      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-      sonarcloud-qualitygate-wait: true
-      sonar-mvn-goal: "{sonar_mvn_goal}"
-      build-node: centos8-docker-8c-8g
-      project: "cps/cps-tbdmt"
-      project-name: "cps-cps-tbdmt"
-      branch: "master"
-      mvn-settings: "cps-cps-tbdmt-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-tbdmt-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonarcloud-qualitygate-wait: true
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "cps/cps-tbdmt"
+    project-name: "cps-cps-tbdmt"
+    branch: "master"
+    mvn-settings: "cps-cps-tbdmt-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml
index 2bf9391c7..4c27b92ca 100644
--- a/jjb/cps/cps-cps-temporal-csit.yaml
+++ b/jjb/cps/cps-cps-temporal-csit.yaml
@@ -1,23 +1,23 @@
 ---
 - project:
-      name: cps-cps-temporal-csit
-      jobs:
-          - "{project-name}-review-verification-maven-{stream}":
-                mvn-goals: clean install
-                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
-          - "{project-name}-merge-verification-maven-{stream}":
-                mvn-goals: clean install
-                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
-      project-name: "cps-cps-temporal"
-      recipients: "toine.siebelink@est.tech"
-      # project name in gerrit
-      project: "cps/cps-temporal"
-      stream:
-          - "master":
-                branch: "master"
-          - "jakarta":
-                branch: "jakarta"
-          - "kohn":
-                branch: "kohn"
-      mvn-settings: "cps-cps-temporal-settings"
-      robot-options: ""
+    name: cps-cps-temporal-csit
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker"
+    project-name: "cps-cps-temporal"
+    recipients: "toine.siebelink@est.tech"
+    # project name in gerrit
+    project: "cps/cps-temporal"
+    stream:
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "cps-cps-temporal-settings"
+    robot-options: ""
diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index cf7a524d5..67962e7ad 100644
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -1,105 +1,105 @@
 ---
 - project:
-      name: cps-cps-temporal-project-view
-      project-name: cps-cps-temporal
-      views:
-          - project-view
+    name: cps-cps-temporal-project-view
+    project-name: cps-cps-temporal
+    views:
+      - project-view
 
 - project:
-      name: cps-cps-temporal-info
-      project: cps/cps-temporal
-      project-name: cps-cps-temporal
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: cps-cps-temporal-info
+    project: cps/cps-temporal
+    project-name: cps-cps-temporal
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
 
 - project:
-      name: cps-cps-temporal
-      java-version: openjdk11
-      mvn-version: mvn36
-      maven-version: mvn36
-      project-name: cps-cps-temporal
-      project: cps/cps-temporal
-      mvn-snapshot-id: "ecomp-snapshots"
-      nexus-snapshot-repo: "snapshots"
-      jobs:
-          - gerrit-maven-docker-verify:
-                container-public-registry: nexus3.onap.org:10001
-          - gerrit-maven-docker-merge:
-                container-public-registry: nexus3.onap.org:10001
-                container-snapshot-registry: nexus3.onap.org:10003
-          - gerrit-maven-docker-stage:
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-params: -Pdocker
-                container-public-registry: nexus3.onap.org:10001
-                container-staging-registry: nexus3.onap.org:10003
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      stream:
-          - "master":
-                branch: master
-          - "jakarta":
-                branch: "jakarta"
-                cron: ""
-          - "kohn":
-                branch: "kohn"
-                cron: ""
-      mvn-settings: cps-cps-temporal-settings
-      files: "**"
-      archive-artifacts: ""
-      build-node: centos8-docker-8c-8g
+    name: cps-cps-temporal
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    project-name: cps-cps-temporal
+    project: cps/cps-temporal
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    jobs:
+      - gerrit-maven-docker-verify:
+          container-public-registry: nexus3.onap.org:10001
+      - gerrit-maven-docker-merge:
+          container-public-registry: nexus3.onap.org:10001
+          container-snapshot-registry: nexus3.onap.org:10003
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: -Pdocker
+          container-public-registry: nexus3.onap.org:10001
+          container-staging-registry: nexus3.onap.org:10003
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: master
+      - "jakarta":
+          branch: "jakarta"
+          cron: ""
+      - "kohn":
+          branch: "kohn"
+          cron: ""
+    mvn-settings: cps-cps-temporal-settings
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-cps-temporal-clm
-      java-version: openjdk11
-      mvn-version: mvn36
-      maven-version: mvn36
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: onap-
-      project: cps/cps-temporal
-      project-name: cps-cps-temporal
-      branch: master
-      mvn-settings: cps-cps-temporal-settings
-      build-node: centos8-docker-8c-8g
+    name: cps-cps-temporal-clm
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: onap-
+    project: cps/cps-temporal
+    project-name: cps-cps-temporal
+    branch: master
+    mvn-settings: cps-cps-temporal-settings
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-cps-temporal-sonar
-      java-version: openjdk11
-      mvn-version: mvn36
-      maven-version: mvn36
-      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: centos8-docker-8c-8g
-      project: "cps/cps-temporal"
-      project-name: "cps-cps-temporal"
-      branch: "master"
-      mvn-settings: "cps-cps-temporal-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-cps-temporal-sonar
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    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: centos8-docker-8c-8g
+    project: "cps/cps-temporal"
+    project-name: "cps-cps-temporal"
+    branch: "master"
+    mvn-settings: "cps-cps-temporal-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: cps-cps-temporal-sonar-verify
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-sonar-verify
-      sonarcloud: true
-      sonarcloud-project-organization: "{sonarcloud_project_organization}"
-      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-      sonarcloud-qualitygate-wait: true
-      sonar-mvn-goal: "{sonar_mvn_goal}"
-      build-node: centos8-docker-8c-8g
-      project: "cps/cps-temporal"
-      project-name: "cps-cps-temporal"
-      branch: "master"
-      mvn-settings: "cps-cps-temporal-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-cps-temporal-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonarcloud-qualitygate-wait: true
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "cps/cps-temporal"
+    project-name: "cps-cps-temporal"
+    branch: "master"
+    mvn-settings: "cps-cps-temporal-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index 078249b73..e61ce2f5b 100644
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -1,25 +1,25 @@
 ---
 - project:
-      name: cps-csit
-      jobs:
-          - "{project-name}-review-verification-maven-{stream}":
-                mvn-goals: clean install
-                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
-          - "{project-name}-merge-verification-maven-{stream}":
-                mvn-goals: clean install
-                mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
-      project-name: "cps"
-      build-node: ubuntu1804-docker-8c-8g
-      recipients: "toine.siebelink@est.tech"
-      # project name in gerrit
-      project: "cps"
-      stream:
-          - "master":
-                branch: "master"
-          - "jakarta":
-                branch: "jakarta"
-          - "kohn":
-                branch: "kohn"
-      mvn-settings: "cps-settings"
-      robot-options: ""
-      branch: "master"
+    name: cps-csit
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push="
+    project-name: "cps"
+    build-node: ubuntu1804-docker-8c-8g
+    recipients: "toine.siebelink@est.tech"
+    # project name in gerrit
+    project: "cps"
+    stream:
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "cps-settings"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
index 1dd6a962a..f8e55520e 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -1,23 +1,23 @@
 ---
 - project:
-      name: cps-ncmp-dmi-plugin-csit
-      jobs:
-          - "{project-name}-review-verification-maven-{stream}":
-                mvn-goals: clean install
-                mvn-params: "-Dmaven.test.skip=true -Pdocker"
-          - "{project-name}-merge-verification-maven-{stream}":
-                mvn-goals: clean install
-                mvn-params: "-Dmaven.test.skip=true -Pdocker"
-      project-name: "cps-ncmp-dmi-plugin"
-      recipients: "toine.siebelink@est.tech"
-      # project name in gerrit
-      project: "cps/ncmp-dmi-plugin"
-      stream:
-          - "master":
-                branch: "master"
-          - "jakarta":
-                branch: "jakarta"
-          - "kohn":
-                branch: "kohn"
-      mvn-settings: "cps-ncmp-dmi-plugin-settings"
-      robot-options: ""
+    name: cps-ncmp-dmi-plugin-csit
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean install
+          mvn-params: "-Dmaven.test.skip=true -Pdocker"
+    project-name: "cps-ncmp-dmi-plugin"
+    recipients: "toine.siebelink@est.tech"
+    # project name in gerrit
+    project: "cps/ncmp-dmi-plugin"
+    stream:
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "cps-ncmp-dmi-plugin-settings"
+    robot-options: ""
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index e03308eff..908f86531 100644
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -1,111 +1,111 @@
 ---
 - project:
-      name: cps-ncmp-dmi-plugin-project-view
-      project-name: cps-ncmp-dmi-plugin
-      views:
-          - project-view
+    name: cps-ncmp-dmi-plugin-project-view
+    project-name: cps-ncmp-dmi-plugin
+    views:
+      - project-view
 
 - project:
-      name: cps-ncmp-dmi-plugin-info
-      project: cps/ncmp-dmi-plugin
-      project-name: cps-ncmp-dmi-plugin
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: cps-ncmp-dmi-plugin-info
+    project: cps/ncmp-dmi-plugin
+    project-name: cps-ncmp-dmi-plugin
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
 
 - project:
-      name: cps-ncmp-dmi-plugin
-      java-version: openjdk11
-      mvn-version: mvn36
-      maven-version: mvn36
-      project-name: cps-ncmp-dmi-plugin
-      project: cps/ncmp-dmi-plugin
-      mvn-snapshot-id: "ecomp-snapshots"
-      nexus-snapshot-repo: "snapshots"
-      jobs:
-          - gerrit-maven-docker-verify:
-                container-public-registry: nexus3.onap.org:10001
-          - gerrit-maven-merge
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                sbom-generator: true
-          - gerrit-maven-docker-stage:
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-params: -Pdocker
-                container-public-registry: nexus3.onap.org:10001
-                container-staging-registry: nexus3.onap.org:10003
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      stream:
-          - "master":
-                branch: master
-          - "jakarta":
-                branch: "jakarta"
-                cron: ""
-          - "kohn":
-                branch: "kohn"
-                cron: ""
-          - "london":
-                branch: "london"
-                cron: ""
-      mvn-settings: cps-ncmp-dmi-plugin-settings
-      files: "**"
-      archive-artifacts: ""
-      build-node: centos8-docker-8c-8g
+    name: cps-ncmp-dmi-plugin
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    project-name: cps-ncmp-dmi-plugin
+    project: cps/ncmp-dmi-plugin
+    mvn-snapshot-id: "ecomp-snapshots"
+    nexus-snapshot-repo: "snapshots"
+    jobs:
+      - gerrit-maven-docker-verify:
+          container-public-registry: nexus3.onap.org:10001
+      - gerrit-maven-merge
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: -Pdocker
+          container-public-registry: nexus3.onap.org:10001
+          container-staging-registry: nexus3.onap.org:10003
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: master
+      - "jakarta":
+          branch: "jakarta"
+          cron: ""
+      - "kohn":
+          branch: "kohn"
+          cron: ""
+      - "london":
+          branch: "london"
+          cron: ""
+    mvn-settings: cps-ncmp-dmi-plugin-settings
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-ncmp-dmi-plugin-clm
-      java-version: openjdk11
-      mvn-version: mvn36
-      maven-version: mvn36
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: onap-
-      project: cps/ncmp-dmi-plugin
-      project-name: cps-ncmp-dmi-plugin
-      branch: master
-      mvn-settings: cps-ncmp-dmi-plugin-settings
-      build-node: centos8-docker-8c-8g
+    name: cps-ncmp-dmi-plugin-clm
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: onap-
+    project: cps/ncmp-dmi-plugin
+    project-name: cps-ncmp-dmi-plugin
+    branch: master
+    mvn-settings: cps-ncmp-dmi-plugin-settings
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-ncmp-dmi-plugin-sonar
-      java-version: openjdk11
-      mvn-version: mvn36
-      maven-version: mvn36
-      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: centos8-docker-8c-8g
-      project: "cps/ncmp-dmi-plugin"
-      project-name: "cps-ncmp-dmi-plugin"
-      branch: "master"
-      mvn-settings: "cps-ncmp-dmi-plugin-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-ncmp-dmi-plugin-sonar
+    java-version: openjdk11
+    mvn-version: mvn36
+    maven-version: mvn36
+    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: centos8-docker-8c-8g
+    project: "cps/ncmp-dmi-plugin"
+    project-name: "cps-ncmp-dmi-plugin"
+    branch: "master"
+    mvn-settings: "cps-ncmp-dmi-plugin-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: cps-ncmp-dmi-plugin-sonar-verify
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-sonar-verify
-      sonarcloud: true
-      sonarcloud-project-organization: "{sonarcloud_project_organization}"
-      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-      sonarcloud-qualitygate-wait: true
-      sonar-mvn-goal: "{sonar_mvn_goal}"
-      build-node: centos8-docker-8c-8g
-      project: "cps/ncmp-dmi-plugin"
-      project-name: "cps-ncmp-dmi-plugin"
-      branch: "master"
-      mvn-settings: "cps-ncmp-dmi-plugin-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-ncmp-dmi-plugin-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonarcloud-qualitygate-wait: true
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "cps/ncmp-dmi-plugin"
+    project-name: "cps-ncmp-dmi-plugin"
+    branch: "master"
+    mvn-settings: "cps-ncmp-dmi-plugin-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index f3beb5461..1f6ffe4cc 100644
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -1,110 +1,110 @@
 ---
 - project:
-      name: cps-project-view
-      project-name: cps
-      views:
-          - project-view
+    name: cps-project-view
+    project-name: cps
+    views:
+      - project-view
 
 - project:
-      name: cps-info
-      project: cps
-      project-name: cps
-      build-node: centos8-builder-2c-1g
-      jobs:
-          - gerrit-info-yaml-verify
+    name: cps-info
+    project: cps
+    project-name: cps
+    build-node: centos8-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify
 
 - project:
-      name: cps-clm
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: "cps"
-      project-name: "cps"
-      branch: "master"
-      mvn-settings: "cps-settings"
-      build-node: centos8-docker-8c-8g
+    name: cps-clm
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: "cps"
+    project-name: "cps"
+    branch: "master"
+    mvn-settings: "cps-settings"
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      project-name: "cps"
-      project: "cps"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java":
-                docker-pom: "pom.xml"
-                mvn-params: "-P cps-ncmp-docker"
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                sbom-generator: true
-          - gerrit-maven-docker-stage:
-                build-node: centos8-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-params: "-P cps-ncmp-docker"
-                container-public-registry: "nexus3.onap.org:10001"
-                container-staging-registry: "nexus3.onap.org:10003"
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      stream:
-          - "master":
-                branch: "master"
-          - "jakarta":
-                branch: "jakarta"
-                cron: ""
-          - "kohn":
-                branch: "kohn"
-                cron: ""
-          - "london":
-                branch: "london"
-                cron: ""
-      mvn-settings: "cps-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: centos8-docker-8c-8g
+    name: cps
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    project-name: "cps"
+    project: "cps"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P cps-ncmp-docker"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          sbom-generator: true
+      - gerrit-maven-docker-stage:
+          build-node: centos8-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: "-P cps-ncmp-docker"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    stream:
+      - "master":
+          branch: "master"
+      - "jakarta":
+          branch: "jakarta"
+          cron: ""
+      - "kohn":
+          branch: "kohn"
+          cron: ""
+      - "london":
+          branch: "london"
+          cron: ""
+    mvn-settings: "cps-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: centos8-docker-8c-8g
 
 - project:
-      name: cps-sonar
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      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: centos8-docker-8c-8g
-      project: "cps"
-      project-name: "cps"
-      branch: "master"
-      mvn-settings: "cps-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-sonar
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    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: centos8-docker-8c-8g
+    project: "cps"
+    project-name: "cps"
+    branch: "master"
+    mvn-settings: "cps-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: cps-sonar-verify
-      java-version: openjdk11
-      mvn-version: "mvn36"
-      maven-version: "mvn36"
-      jobs:
-          - gerrit-maven-sonar-verify
-      sonarcloud: true
-      sonarcloud-project-organization: "{sonarcloud_project_organization}"
-      sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-      sonarcloud-qualitygate-wait: true
-      sonar-mvn-goal: "{sonar_mvn_goal}"
-      build-node: centos8-docker-8c-8g
-      project: "cps"
-      project-name: "cps"
-      branch: "master"
-      mvn-settings: "cps-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: cps-sonar-verify
+    java-version: openjdk11
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
+    jobs:
+      - gerrit-maven-sonar-verify
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonarcloud-qualitygate-wait: true
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    build-node: centos8-docker-8c-8g
+    project: "cps"
+    project-name: "cps"
+    branch: "master"
+    mvn-settings: "cps-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index be5ef6d1b..04e0a16dd 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -1,81 +1,81 @@
 ---
 - project:
-      name: demo-project-view
-      project-name: demo
-      views:
-          - project-view
+    name: demo-project-view
+    project-name: demo
+    views:
+      - project-view
 
 - project:
-      name: demo
-      project-name: "demo"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
+    name: demo
+    project-name: "demo"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
 
-      project: "demo"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "demo-settings"
-      files: "**"
-      archive-artifacts: ""
+    project: "demo"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "demo-settings"
+    files: "**"
+    archive-artifacts: ""
 
 - project:
-      name: demo-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-builder-4c-4g
-      project: "demo"
-      project-name: "demo"
-      branch: "master"
-      mvn-settings: "demo-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: demo-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-builder-4c-4g
+    project: "demo"
+    project-name: "demo"
+    branch: "master"
+    mvn-settings: "demo-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: demo-info
-      project-name: demo
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: demo
-      branch: master
+    name: demo-info
+    project-name: demo
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: demo
+    branch: master
 
 - project:
-      name: demo-linters
-      project: "demo"
-      project-name: "demo"
-      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: demo-linters
+    project: "demo"
+    project-name: "demo"
+    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/doc/rules.yaml b/jjb/doc/rules.yaml
index 9ff64b5d9..aa17f6848 100644
--- a/jjb/doc/rules.yaml
+++ b/jjb/doc/rules.yaml
@@ -1,159 +1,159 @@
 ---
 - scm:
-      name: doc-scm
-      scm:
-          - git:
-                url: "https://gerrit.onap.org/r/{project}"
-                refspec: "+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*"
-                branches:
-                    - "{ref}"
+    name: doc-scm
+    scm:
+      - git:
+          url: "https://gerrit.onap.org/r/{project}"
+          refspec: "+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*"
+          branches:
+            - "{ref}"
 
 - trigger:
-      name: doc-rules-patchset-created
-      triggers:
-          - gerrit:
-                trigger-on:
-                    - patchset-created-event
-                    - comment-added-contains-event:
-                          comment-contains-value: recheck
-                    - comment-added-contains-event:
-                          comment-contains-value: reverify
-                server-name: "Primary"
-                projects:
-                    - project-compare-type: "ANT"
-                      project-pattern: "**"
-                      branches:
-                          - branch-compare-type: "ANT"
-                            branch-pattern: "**/*"
-                          - branch-compare-type: "ANT"
-                            branch-pattern: "refs/tags/**"
+    name: doc-rules-patchset-created
+    triggers:
+      - gerrit:
+          trigger-on:
+            - patchset-created-event
+            - comment-added-contains-event:
+                comment-contains-value: recheck
+            - comment-added-contains-event:
+                comment-contains-value: reverify
+          server-name: "Primary"
+          projects:
+            - project-compare-type: "ANT"
+              project-pattern: "**"
+              branches:
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/*"
+                - branch-compare-type: "ANT"
+                  branch-pattern: "refs/tags/**"
 
 - builder:
-      name: doc-rules
-      builders:
-          # yamllint disable rule:line-length
-          - shell: |
-                #!/bin/bash
-                . /lib/lsb/init-functions || exit 0
-                exitstatus="0"
-                warning="0"
-                # message, begin
-                log_success_msg "INFO Starting additional checks related to documentation."
-                log_success_msg "INFO See https://git.onap.org/doc/doc-best-practice for example config files (master branch)."
-                log_success_msg "INFO Modify example config files if you like to use them in a release branch."
-                log_success_msg "INFO See https://wiki.onap.org/x/w4IEBw for the detailed procedure #02."
-                log_success_msg "INFO In case of questions please contact the ONAP documentation team."
-                # docs directory
-                if [ ! -d docs ] ; then
-                  log_success_msg "INFO Directory docs not found. Skipping further checks."
-                  exit 0
-                fi
-                # config files, required
-                for i in docs/index.rst docs/conf.py docs/requirements-docs.txt docs/_static/css/ribbon.css; do
-                  if [ ! -f $i ] ; then
-                    log_failure_msg "FAIL $i missing. Please add it or remove the full docs directory."
-                    exitstatus="1"
-                  else
-                    log_success_msg "INFO $i found."
-                  fi
-                done
-                # config files, no longer required
-                for i in docs/conf.yaml; do
-                  if [ -f $i ] ; then
-                    log_failure_msg "FAIL $i found. It is no longer required. Please remove it."
-                    exitstatus="1"
-                  else
-                    log_success_msg "INFO $i not found."
-                  fi
-                done
-                # tox.ini @ docs directory
-                filename="docs/tox.ini"
-                if [ ! -f $filename ] ; then
-                  log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory."
-                  exitstatus="1"
+    name: doc-rules
+    builders:
+      # yamllint disable rule:line-length
+      - shell: |
+          #!/bin/bash
+          . /lib/lsb/init-functions || exit 0
+          exitstatus="0"
+          warning="0"
+          # message, begin
+          log_success_msg "INFO Starting additional checks related to documentation."
+          log_success_msg "INFO See https://git.onap.org/doc/doc-best-practice for example config files (master branch)."
+          log_success_msg "INFO Modify example config files if you like to use them in a release branch."
+          log_success_msg "INFO See https://wiki.onap.org/x/w4IEBw for the detailed procedure #02."
+          log_success_msg "INFO In case of questions please contact the ONAP documentation team."
+          # docs directory
+          if [ ! -d docs ] ; then
+            log_success_msg "INFO Directory docs not found. Skipping further checks."
+            exit 0
+          fi
+          # config files, required
+          for i in docs/index.rst docs/conf.py docs/requirements-docs.txt docs/_static/css/ribbon.css; do
+            if [ ! -f $i ] ; then
+              log_failure_msg "FAIL $i missing. Please add it or remove the full docs directory."
+              exitstatus="1"
+            else
+              log_success_msg "INFO $i found."
+            fi
+          done
+          # config files, no longer required
+          for i in docs/conf.yaml; do
+            if [ -f $i ] ; then
+              log_failure_msg "FAIL $i found. It is no longer required. Please remove it."
+              exitstatus="1"
+            else
+              log_success_msg "INFO $i not found."
+            fi
+          done
+          # tox.ini @ docs directory
+          filename="docs/tox.ini"
+          if [ ! -f $filename ] ; then
+            log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory."
+            exitstatus="1"
+          else
+            log_success_msg "INFO $filename found."
+            # sphinx-build command and -W option
+            sphinxbuild_detected=0
+            linenumber=0
+            while IFS="" read -r line || [ -n "$line" ] ; do
+              linenumber=$((linenumber+1))
+              if echo $line | grep -q '^[ \t]*sphinx-build.*' ; then
+                sphinxbuild_detected="1"
+                if echo $line | grep -q '^[ \t]*sphinx-build.* -W ' ; then
+                  log_success_msg "INFO sphinx-build option '-W' used in $filename, line $linenumber."
+                elif echo $line | grep -q ' \-b spelling ' ; then
+                  log_warning_msg "WARN sphinx-build option '-W' missing for spellcheck in $filename, line $linenumber."
+                  warning="1"
                 else
-                  log_success_msg "INFO $filename found."
-                  # sphinx-build command and -W option
-                  sphinxbuild_detected=0
-                  linenumber=0
-                  while IFS="" read -r line || [ -n "$line" ] ; do
-                    linenumber=$((linenumber+1))
-                    if echo $line | grep -q '^[ \t]*sphinx-build.*' ; then
-                      sphinxbuild_detected="1"
-                      if echo $line | grep -q '^[ \t]*sphinx-build.* -W ' ; then
-                        log_success_msg "INFO sphinx-build option '-W' used in $filename, line $linenumber."
-                      elif echo $line | grep -q ' \-b spelling ' ; then
-                        log_warning_msg "WARN sphinx-build option '-W' missing for spellcheck in $filename, line $linenumber."
-                        warning="1"
-                      else
-                        log_failure_msg "FAIL sphinx-build option '-W' missing in $filename, line $linenumber. Please add it."
-                        exitstatus="1"
-                      fi
-                    fi
-                  done < $filename
-                  if [ "$sphinxbuild_detected" = "0" ]; then
-                    log_failure_msg "FAIL Sphinx-build command(s) missing in $filename. Please add it."
-                    exitstatus="1"
-                  fi
-                  # second tox.ini @ root directory
-                  if [ -f ./tox.ini ] ; then
-                    # sphinx-build command
-                    if cat ./tox.ini | grep -q '^[ \t]*sphinx-build.*' ; then
-                      log_warning_msg "WARN tox.ini also exists in root directory and contains sphinx-build command(s). Please check for redundancies."
-                      warning="1"
-                    fi
-                  fi
-                  unset sphinxbuild_detected
-                  unset linenumber
-                fi
-                unset filename
-                # ribbon.css
-                filename="docs/_static/css/ribbon.css"
-                if [ ! -f $filename ]; then
-                  log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory."
+                  log_failure_msg "FAIL sphinx-build option '-W' missing in $filename, line $linenumber. Please add it."
                   exitstatus="1"
-                else
-                  log_success_msg "INFO $filename found."
-                  # max-width parameter
-                  cssmaxwidth=$(grep '^[ \t]*max-width:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//');
-                  if [[ ! $cssmaxwidth == *"max-width: 800px"* ]]; then
-                    log_failure_msg "FAIL Setting 'max-width: 800px' missing in $filename. Please add it."
-                    exitstatus="1"
-                  else
-                    log_success_msg "INFO Setting 'max-width: 800px' found in $filename."
-                  fi
-                  unset cssmaxwidth
-                fi
-                unset filename
-                # message, end
-                if [ "$exitstatus" = "0" ]; then
-                  if [ "$warning" = "0" ]; then
-                    log_success_msg "INFO Congratulations! No documentation problem(s) detected."
-                  else
-                    log_warning_msg "WARN No major documentation problem(s) detected but there are warnings!"
-                  fi
-                else
-                  if [ ! "$warning" = "0" ]; then
-                    log_warning_msg "WARN Please check the detected documentation warning(s)!"
-                  fi
-                  log_failure_msg "FAIL Please fix the detected documentation problem(s)!"
                 fi
-                exit $exitstatus
-          # yamllint enable
+              fi
+            done < $filename
+            if [ "$sphinxbuild_detected" = "0" ]; then
+              log_failure_msg "FAIL Sphinx-build command(s) missing in $filename. Please add it."
+              exitstatus="1"
+            fi
+            # second tox.ini @ root directory
+            if [ -f ./tox.ini ] ; then
+              # sphinx-build command
+              if cat ./tox.ini | grep -q '^[ \t]*sphinx-build.*' ; then
+                log_warning_msg "WARN tox.ini also exists in root directory and contains sphinx-build command(s). Please check for redundancies."
+                warning="1"
+              fi
+            fi
+            unset sphinxbuild_detected
+            unset linenumber
+          fi
+          unset filename
+          # ribbon.css
+          filename="docs/_static/css/ribbon.css"
+          if [ ! -f $filename ]; then
+            log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory."
+            exitstatus="1"
+          else
+            log_success_msg "INFO $filename found."
+            # max-width parameter
+            cssmaxwidth=$(grep '^[ \t]*max-width:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//');
+            if [[ ! $cssmaxwidth == *"max-width: 800px"* ]]; then
+              log_failure_msg "FAIL Setting 'max-width: 800px' missing in $filename. Please add it."
+              exitstatus="1"
+            else
+              log_success_msg "INFO Setting 'max-width: 800px' found in $filename."
+            fi
+            unset cssmaxwidth
+          fi
+          unset filename
+          # message, end
+          if [ "$exitstatus" = "0" ]; then
+            if [ "$warning" = "0" ]; then
+              log_success_msg "INFO Congratulations! No documentation problem(s) detected."
+            else
+              log_warning_msg "WARN No major documentation problem(s) detected but there are warnings!"
+            fi
+          else
+            if [ ! "$warning" = "0" ]; then
+              log_warning_msg "WARN Please check the detected documentation warning(s)!"
+            fi
+            log_failure_msg "FAIL Please fix the detected documentation problem(s)!"
+          fi
+          exit $exitstatus
+      # yamllint enable
 
 - job-template:
-      name: doc-rules
-      node: ubuntu1804-docker-8c-8g
-      triggers:
-          - doc-rules-patchset-created
-      scm:
-          - doc-scm:
-                ref: $GERRIT_REFSPEC
-                project: $GERRIT_PROJECT
-      builders:
-          - doc-rules
+    name: doc-rules
+    node: ubuntu1804-docker-8c-8g
+    triggers:
+      - doc-rules-patchset-created
+    scm:
+      - doc-scm:
+          ref: $GERRIT_REFSPEC
+          project: $GERRIT_PROJECT
+    builders:
+      - doc-rules
 
 - project:
-      name: "doc-rules"
-      jobs:
-          - "doc-rules"
+    name: "doc-rules"
+    jobs:
+      - "doc-rules"
diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml
index 16ce20216..ef875726e 100644
--- a/jjb/externalapi/externalapi-nbi.yaml
+++ b/jjb/externalapi/externalapi-nbi.yaml
@@ -1,93 +1,93 @@
 ---
 - project:
-      name: externalapi-project-view
-      project-name: externalapi
-      views:
-          - project-view
+    name: externalapi-project-view
+    project-name: externalapi
+    views:
+      - project-view
 
 - project:
-      name: externalapi-nbi
-      project-name: "externalapi-nbi"
-      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
-                mvn-params: "-Dmaven.test.skip=true"
-          - gerrit-maven-docker-stage:
-                build-node: ubuntu1804-docker-8c-8g
-                maven-versions-plugin: true
-                container-public-registry: "nexus3.onap.org:10001"
-                container-staging-registry: "nexus3.onap.org:10003"
-                mvn-params: "-Dmaven.test.skip=true -P docker"
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      project: "externalapi/nbi"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "externalapi-nbi-settings"
-      java-version: openjdk11
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: externalapi-nbi
+    project-name: "externalapi-nbi"
+    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
+          mvn-params: "-Dmaven.test.skip=true"
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -P docker"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "externalapi/nbi"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "externalapi-nbi-settings"
+    java-version: openjdk11
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: externalapi-nbi-arm64
-      project-name: "externalapi-nbi-arm64"
-      jobs:
-          - "{project-name}-{stream}-docker-version-java-daily":
-                docker-pom: "pom.xml"
-                mvn-profile: "docker"
-                mvn-params: "-Dmaven.test.skip=true"
-                build-node: "ubuntu1804-docker-arm64-4c-2g"
-      project: "externalapi/nbi"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "externalapi-nbi-settings"
-      files: "**"
-      archive-artifacts: ""
+    name: externalapi-nbi-arm64
+    project-name: "externalapi-nbi-arm64"
+    jobs:
+      - "{project-name}-{stream}-docker-version-java-daily":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-Dmaven.test.skip=true"
+          build-node: "ubuntu1804-docker-arm64-4c-2g"
+    project: "externalapi/nbi"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "externalapi-nbi-settings"
+    files: "**"
+    archive-artifacts: ""
 
 - project:
-      name: externalapi-nbi-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: "externalapi/nbi"
-      project-name: "externalapi-nbi"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "externalapi-nbi-settings"
-      java-version: openjdk11
+    name: externalapi-nbi-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: "externalapi/nbi"
+    project-name: "externalapi-nbi"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "externalapi-nbi-settings"
+    java-version: openjdk11
 
 - project:
-      name: externalapi-nbi-sonar
-      jobs:
-          - gerrit-maven-sonar-prescan-script
-      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-builder-4c-4g
-      project: "externalapi/nbi"
-      project-name: "externalapi-nbi"
-      branch: "master"
-      mvn-settings: "externalapi-nbi-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-      java-version: openjdk11
-      sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
+    name: externalapi-nbi-sonar
+    jobs:
+      - gerrit-maven-sonar-prescan-script
+    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-builder-4c-4g
+    project: "externalapi/nbi"
+    project-name: "externalapi-nbi"
+    branch: "master"
+    mvn-settings: "externalapi-nbi-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk11
+    sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
-      name: externalapi-nbi-info
-      project-name: externalapi-nbi
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: externalapi/nbi
-      branch: master
+    name: externalapi-nbi-info
+    project-name: externalapi-nbi
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: externalapi/nbi
+    branch: master
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 74ad45061..155a46ad2 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1,1108 +1,1108 @@
 ---
 - job-template: &verify_java_defaults
-      # Job template for Java verify jobs
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean install
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      name: "{project-name}-{stream}-verify-java"
-
-      project-type: freestyle
-      concurrent: true
-      node: "{build-node}"
-      build-env-variables: ""
-      pattern: "**"
-      pom:
-      mvn-opts: ""
-      java-opts: ""
-      java-version: openjdk8
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-          - maven-params:
-                mvn-params: "{mvn-params}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: "$GERRIT_REFSPEC"
-                choosing-strategy: "gerrit"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          - gerrit-trigger-patch-submitted:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-                files: "{obj:pattern}"
-
-      builders:
-          - lf-infra-pre-build
-          - lf-update-java-alternatives:
-                java-version: "{java-version}"
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-          - inject:
-                properties-content: "{build-env-variables}"
-          - maven-target:
-                maven-version: "{maven-version}"
-                pom: "{obj:pom}"
-                # yamllint disable rule:line-length
-                goals: "clean install -B
-                    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}"
-                # yamlline enable
-                properties:
-                    - MAVEN_OPTS='{mvn-opts}'
-                java-opts:
-                    - "{java-opts}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-      publishers:
-          - lf-infra-publish
-
-- job-template:
-      # Job template for Java verify jobs running checkstyle at the end
-      # When checkstyle will be fully incorporated, it is meant to replace
-      #  '{project-name}-{stream}-verify-java-checkstyle'
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean install
-      #
-      # This job publishes checkstyle results.
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      <<: *verify_java_defaults
-      name: "{project-name}-{stream}-verify-java-checkstyle"
-
-      publishers:
-          - lf-infra-publish
-          - checkstyle-result
+    # Job template for Java verify jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    name: "{project-name}-{stream}-verify-java"
+
+    project-type: freestyle
+    concurrent: true
+    node: "{build-node}"
+    build-env-variables: ""
+    pattern: "**"
+    pom:
+    mvn-opts: ""
+    java-opts: ""
+    java-version: openjdk8
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+      - maven-params:
+          mvn-params: "{mvn-params}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{obj:pattern}"
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+      - inject:
+          properties-content: "{build-env-variables}"
+      - maven-target:
+          maven-version: "{maven-version}"
+          pom: "{obj:pom}"
+          # yamllint disable rule:line-length
+          goals: "clean install -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn {mvn-params}"
+          # yamlline enable
+          properties:
+            - MAVEN_OPTS='{mvn-opts}'
+          java-opts:
+            - "{java-opts}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for Java verify jobs with POM not at the root
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean install
-      #
-      # This job supports subprojects.
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     pattern:   ant file-path pattern relative to the workspace used to
-      #                trigger the job
-
-      <<: *verify_java_defaults
-      name: "{project-name}-{stream}-{subproject}-verify-java"
+    # Job template for Java verify jobs running checkstyle at the end
+    # When checkstyle will be fully incorporated, it is meant to replace
+    #  '{project-name}-{stream}-verify-java-checkstyle'
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # This job publishes checkstyle results.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *verify_java_defaults
+    name: "{project-name}-{stream}-verify-java-checkstyle"
+
+    publishers:
+      - lf-infra-publish
+      - checkstyle-result
 
 - job-template:
-      # Job template for Java integration pairwise jobs
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean install
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      <<: *verify_java_defaults
-      name: "{project-name}-{stream}-integration-pairwise"
-      triggers:
-          - timed: "@daily"
-          - gerrit-trigger-patch-submitted:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-                files: "{obj:pattern}"
+    # Job template for Java verify jobs with POM not at the root
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # This job supports subprojects.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     pattern:   ant file-path pattern relative to the workspace used to
+    #                trigger the job
+
+    <<: *verify_java_defaults
+    name: "{project-name}-{stream}-{subproject}-verify-java"
 
 - job-template:
-      # Job template for Java daily release jobs running checkstyle at the end
-      # When checkstyle will be fully incorporated, it is meant to replace
-      #  '{project-name}-{stream}-release-java-daily'
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean deploy with Sonar scans
-      #
-      # This job publishes checkstyle results.
-      # This job uses a conditional regex match step to set versions.
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      name: "{project-name}-{stream}-release-java-daily-checkstyle"
-      project-type: freestyle
-      node: "{build-node}"
-      disabled: false
-      maven-deploy-properties:
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-      triggers:
-          # 11 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-          - conditional-step:
-                condition-kind: regex-match
-                regex: DoSetVersion
-                label: "{setVersion}"
-                steps:
-                    - inject:
-                          properties-file: version.properties
-                    - maven-set-release-version:
-                          maven-version: "{maven-version}"
-                          mvn-settings: "{mvn-settings}"
-                          pom:
-          - maven-target:
-                maven-version: "{maven-version}"
-                goals: "clean deploy -B
-                    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-                properties: "{obj:mvn_properties}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-      publishers:
-          - lf-infra-publish
-          - checkstyle-result-daily
+    # Job template for Java integration pairwise jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean install
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *verify_java_defaults
+    name: "{project-name}-{stream}-integration-pairwise"
+    triggers:
+      - timed: "@daily"
+      - gerrit-trigger-patch-submitted:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{obj:pattern}"
 
 - job-template:
-      # Job template for Java daily release jobs
-      #
-      # The purpose of this job template is to run:
-      # 1. maven set versions
-      # 2. maven clean deploy with Sonar scans
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      name: "{project-name}-{stream}-release-version-java-daily"
-
-      project-type: freestyle
-      disabled: false
-      node: "{build-node}"
-      maven-deploy-properties:
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 11 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - inject:
+    # Job template for Java daily release jobs running checkstyle at the end
+    # When checkstyle will be fully incorporated, it is meant to replace
+    #  '{project-name}-{stream}-release-java-daily'
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy with Sonar scans
+    #
+    # This job publishes checkstyle results.
+    # This job uses a conditional regex match step to set versions.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    name: "{project-name}-{stream}-release-java-daily-checkstyle"
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: false
+    maven-deploy-properties:
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+    triggers:
+      # 11 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+      - conditional-step:
+          condition-kind: regex-match
+          regex: DoSetVersion
+          label: "{setVersion}"
+          steps:
+            - inject:
                 properties-file: version.properties
-          - maven-set-release-version:
+            - maven-set-release-version:
                 maven-version: "{maven-version}"
                 mvn-settings: "{mvn-settings}"
                 pom:
+      - maven-target:
+          maven-version: "{maven-version}"
+          goals: "clean deploy -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+          properties: "{obj:mvn_properties}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+    publishers:
+      - lf-infra-publish
+      - checkstyle-result-daily
 
-          - maven-target:
-                maven-version: "{maven-version}"
-                goals: "clean deploy -B
-                    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-                properties:
-                    - "{maven-deploy-properties}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-      publishers:
-          - lf-infra-publish
+- job-template:
+    # Job template for Java daily release jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. maven set versions
+    # 2. maven clean deploy with Sonar scans
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    name: "{project-name}-{stream}-release-version-java-daily"
+
+    project-type: freestyle
+    disabled: false
+    node: "{build-node}"
+    maven-deploy-properties:
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 11 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - inject:
+          properties-file: version.properties
+      - maven-set-release-version:
+          maven-version: "{maven-version}"
+          mvn-settings: "{mvn-settings}"
+          pom:
+
+      - maven-target:
+          maven-version: "{maven-version}"
+          goals: "clean deploy -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+          properties:
+            - "{maven-deploy-properties}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+    publishers:
+      - lf-infra-publish
 
 - job-template: &merge_java_defaults
-      # Job template for Java merge jobs
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean deploy
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      name: "{project-name}-{stream}-merge-java"
-
-      project-type: freestyle
-      node: "{build-node}"
-      pattern: "**"
-      pom:
-      mvn_properties: []
-      mvn-params: ""
-      mvn-opts: ""
-      java-opts: ""
-      java-version: openjdk8
-
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - lf-infra-wrappers:
-                build-timeout: "{build-timeout}"
-                jenkins-ssh-credential: "{jenkins-ssh-credential}"
-
-      triggers:
-          - gerrit-trigger-patch-merged:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-                files: "{pattern}"
-
-      builders:
-          - lf-infra-pre-build
-          - lf-update-java-alternatives:
-                java-version: "{java-version}"
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-          - conditional-step:
-                condition-kind: regex-match
-                regex: .*(amd64|arm64).*
-                label: "{project-name}"
-                steps:
-                    - shell: !include-raw-escape: global-jjb/shell/docker-login.sh
-          - maven-target:
-                maven-version: "{maven-version}"
-                pom: "{obj:pom}"
-                goals: "clean deploy -B {mvn-params}
-                    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-                java-opts:
-                    - "{java-opts}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-                properties: "{obj:mvn_properties}"
-
-      publishers:
-          - lf-infra-publish
+    # Job template for Java merge jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    name: "{project-name}-{stream}-merge-java"
+
+    project-type: freestyle
+    node: "{build-node}"
+    pattern: "**"
+    pom:
+    mvn_properties: []
+    mvn-params: ""
+    mvn-opts: ""
+    java-opts: ""
+    java-version: openjdk8
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+      - conditional-step:
+          condition-kind: regex-match
+          regex: .*(amd64|arm64).*
+          label: "{project-name}"
+          steps:
+            - shell: !include-raw-escape: global-jjb/shell/docker-login.sh
+      - maven-target:
+          maven-version: "{maven-version}"
+          pom: "{obj:pom}"
+          goals: "clean deploy -B {mvn-params}
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+          java-opts:
+            - "{java-opts}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+          properties: "{obj:mvn_properties}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for Java merge jobs based on
-      #   '{project-name}-{stream}-merge-java'
-      # The purpose of this job template is to run:
-      # 1. maven clean deploy
-      #
-      # This project supports maven properties.
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-      #     maven-properties: properties passed to maven
-
-      <<: *merge_java_defaults
-      name: "{project-name}-{stream}-merge-properties-java"
-
-      wrappers:
-          - lf-infra-wrappers:
-                build-timeout: "{build-timeout}"
-                jenkins-ssh-credential: "{jenkins-ssh-credential}"
+    # Job template for Java merge jobs based on
+    #   '{project-name}-{stream}-merge-java'
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
+    #
+    # This project supports maven properties.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     maven-properties: properties passed to maven
+
+    <<: *merge_java_defaults
+    name: "{project-name}-{stream}-merge-properties-java"
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
 - job-template:
-      # Job template for Java merge jobs that takes a maven template
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean deploy -P {mvn-profile}
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      <<: *merge_java_defaults
-      name: "{project-name}-{stream}-merge-profile-java"
-
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - docker-login
-
-          - maven-target:
-                maven-version: "{maven-version}"
-                goals: "clean deploy -P {mvn-profile} -B
-                    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-                properties:
-                    - docker.pull.registry=nexus3.onap.org:10001
-                    - docker.push.registry=nexus3.onap.org:10003
+    # Job template for Java merge jobs that takes a maven template
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy -P {mvn-profile}
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *merge_java_defaults
+    name: "{project-name}-{stream}-merge-profile-java"
+
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - docker-login
+
+      - maven-target:
+          maven-version: "{maven-version}"
+          goals: "clean deploy -P {mvn-profile} -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+          properties:
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
 
 - job-template:
-      # Job template for Java merge jobs with POM not at the root
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean deploy
-      #
-      # This job supports subprojects.
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     pattern:   ant file-path pattern relative to the workspace used to
-      #                trigger the job
-
-      <<: *merge_java_defaults
-      name: "{project-name}-{stream}-{subproject}-merge-java"
+    # Job template for Java merge jobs with POM not at the root
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
+    #
+    # This job supports subprojects.
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     pattern:   ant file-path pattern relative to the workspace used to
+    #                trigger the job
+
+    <<: *merge_java_defaults
+    name: "{project-name}-{stream}-{subproject}-merge-java"
 
 - job-template: &docker_java_defaults
-      # Job template for Docker daily jobs
-      #
-      # The purpose of this job template is to run:
-      # 1. login to the docker registry
-      # 2. docker push
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      name: "{project-name}-{stream}-docker-java-daily"
-      id: "{project-name}-{stream}-docker-java-daily"
-      project-type: freestyle
-      node: "{build-node}"
-      disabled: false
-      java-version: openjdk8
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-          - maven-params:
-                mvn-params: "{mvn-params}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 12 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - lf-update-java-alternatives:
-                java-version: "{java-version}"
-
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - docker-login
-
-          - maven-docker-push-daily:
-                maven-version: "{maven-version}"
-                mvn-settings: "{mvn-settings}"
-                pom: "{docker-pom}"
-                # use default as mvn-profile if profile is not needed
-                mvn-profile: "{mvn-profile}"
-                mvn-params: "{mvn-params}"
-
-      publishers:
-          - lf-infra-publish
+    # Job template for Docker daily jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. login to the docker registry
+    # 2. docker push
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    name: "{project-name}-{stream}-docker-java-daily"
+    id: "{project-name}-{stream}-docker-java-daily"
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: false
+    java-version: openjdk8
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+      - maven-params:
+          mvn-params: "{mvn-params}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 12 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - docker-login
+
+      - maven-docker-push-daily:
+          maven-version: "{maven-version}"
+          mvn-settings: "{mvn-settings}"
+          pom: "{docker-pom}"
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: "{mvn-profile}"
+          mvn-params: "{mvn-params}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for Docker daily jobs
-      #
-      # The purpose of this job template is to run:
-      # 1. login to the docker registry
-      # 2. docker push
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      <<: *docker_java_defaults
-      name: "{project-name}-{stream}-docker-java-daily"
-      id: docker-java-daily
-      node: "{build-node}"
-      wrappers:
-          - infra-wrappers-docker-build:
-                build-timeout: "{build-timeout}"
+    # Job template for Docker daily jobs
+    #
+    # The purpose of this job template is to run:
+    # 1. login to the docker registry
+    # 2. docker push
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *docker_java_defaults
+    name: "{project-name}-{stream}-docker-java-daily"
+    id: docker-java-daily
+    node: "{build-node}"
+    wrappers:
+      - infra-wrappers-docker-build:
+          build-timeout: "{build-timeout}"
 
 - job-template:
-      # Job template for building & pushing docker images
-      #
-      # The purpose of this job template is to run:
-      #  1. login to the docker registry
-      #  2. run a specified shell builder
-      #
-      # Required Variables:
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     maven-properties: properties passed to maven
-
-      name: "{project-name}-{stream}-docker-java-shell-daily"
-      project-type: freestyle
-      node: "{build-node}"
-      disabled: false
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 12 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - docker-login
-
-          - maven-target:
-                maven-version: "{maven-version}"
-                goals: "{mvn-goals}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-          - shell: "{script}"
-
-      publishers:
-          - lf-infra-publish
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run a specified shell builder
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
+    name: "{project-name}-{stream}-docker-java-shell-daily"
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: false
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 12 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - docker-login
+
+      - maven-target:
+          maven-version: "{maven-version}"
+          goals: "{mvn-goals}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+      - shell: "{script}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for building & pushing docker images
-      #
-      # The purpose of this job template is to run:
-      #  1. login to the docker registry
-      #  2. run a specified shell builder
-      #
-      # Required Variables:
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     maven-properties: properties passed to maven
-
-      name: "{project-name}-{stream}-{subproject}-docker-java-shell-daily"
-      project-type: freestyle
-      node: "{build-node}"
-      disabled: false
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 12 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-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}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-          - shell: "{script}"
-
-      publishers:
-          - lf-infra-publish
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run a specified shell builder
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
+    name: "{project-name}-{stream}-{subproject}-docker-java-shell-daily"
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: false
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 12 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-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}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+      - shell: "{script}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for building & pushing docker images
-      #
-      # The purpose of this job template is to run:
-      #  1. login to the docker registry
-      #  2. inject a version.properties file and set versions
-      #  3. run a specified shell builder
-      #
-      # Required Variables:
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     maven-properties: properties passed to maven
-
-      name: "{project-name}-{stream}-docker-java-version-shell-daily"
-      project-type: freestyle
-      node: "{build-node}"
-      disabled: false
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 12 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - inject:
-                properties-file: version.properties
-          - maven-set-release-version:
-                maven-version: "{maven-version}"
-                mvn-settings: "{mvn-settings}"
-                pom:
-
-          - docker-login
-
-          - maven-target:
-                maven-version: "{maven-version}"
-                goals: "{mvn-goals}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-          - shell: "{script}"
-
-      publishers:
-          - lf-infra-publish
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a specified shell builder
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
+    name: "{project-name}-{stream}-docker-java-version-shell-daily"
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: false
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 12 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - inject:
+          properties-file: version.properties
+      - maven-set-release-version:
+          maven-version: "{maven-version}"
+          mvn-settings: "{mvn-settings}"
+          pom:
+
+      - docker-login
+
+      - maven-target:
+          maven-version: "{maven-version}"
+          goals: "{mvn-goals}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+      - shell: "{script}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for building & pushing docker images
-      #
-      # The purpose of this job template is to run:
-      #  1. login to the docker registry
-      #  2. inject a version.properties file and set versions
-      #  3. run a specified shell builder
-      #
-      # This template supports subprojects.
-      #
-      # Required Variables:
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     maven-properties: properties passed to maven
-
-      name: "{project-name}-{stream}-{subproject}-docker-java-version-shell-daily"
-      project-type: freestyle
-      node: "ubuntu1804-docker-8c-8g"
-      disabled: false
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 12 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - inject:
-                properties-file: version.properties
-          - maven-set-release-version:
-                maven-version: "{maven-version}"
-                mvn-settings: "{mvn-settings}"
-                pom: "{pom}"
-
-          - docker-login
-
-          - maven-target:
-                maven-version: "{maven-version}"
-                pom: "{pom}"
-                goals: "{mvn-goals}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-          - shell: "{script}"
-
-      publishers:
-          - lf-infra-publish
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a specified shell builder
+    #
+    # This template supports subprojects.
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
+    name: "{project-name}-{stream}-{subproject}-docker-java-version-shell-daily"
+    project-type: freestyle
+    node: "ubuntu1804-docker-8c-8g"
+    disabled: false
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 12 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - inject:
+          properties-file: version.properties
+      - maven-set-release-version:
+          maven-version: "{maven-version}"
+          mvn-settings: "{mvn-settings}"
+          pom: "{pom}"
+
+      - docker-login
+
+      - maven-target:
+          maven-version: "{maven-version}"
+          pom: "{pom}"
+          goals: "{mvn-goals}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+      - shell: "{script}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template: &docker_version_java_defaults
-      # Job template for building & pushing docker images
-      #
-      # The purpose of this job template is to run:
-      #  1. login to the docker registry
-      #  2. inject a version.properties file and set versions
-      #  3. run a docker push
-      #
-      # Required Variables:
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     profile:   the docker profile defined in the pom
-      #     maven-properties: properties passed to maven
-
-      name: "{project-name}-{stream}-docker-version-java-daily"
-      id: "{project-name}-{stream}-docker-version-java-daily"
-      project-type: freestyle
-      node: "{build-node}"
-      disabled: false
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-          - maven-params:
-                mvn-params: "{mvn-params}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 12 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - inject:
-                properties-file: version.properties
-          - maven-set-release-version:
-                maven-version: "{maven-version}"
-                mvn-settings: "{mvn-settings}"
-                pom:
-
-          - docker-login
-
-          - maven-docker-push-daily:
-                maven-version: "{maven-version}"
-                mvn-settings: "{mvn-settings}"
-                pom: "{docker-pom}"
-                # use default as mvn-profile if profile is not needed
-                mvn-profile: "{mvn-profile}"
-                mvn-params: "{mvn-params}"
-
-      publishers:
-          - lf-infra-publish
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a docker push
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     profile:   the docker profile defined in the pom
+    #     maven-properties: properties passed to maven
+
+    name: "{project-name}-{stream}-docker-version-java-daily"
+    id: "{project-name}-{stream}-docker-version-java-daily"
+    project-type: freestyle
+    node: "{build-node}"
+    disabled: false
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+      - maven-params:
+          mvn-params: "{mvn-params}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 12 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - inject:
+          properties-file: version.properties
+      - maven-set-release-version:
+          maven-version: "{maven-version}"
+          mvn-settings: "{mvn-settings}"
+          pom:
+
+      - docker-login
+
+      - maven-docker-push-daily:
+          maven-version: "{maven-version}"
+          mvn-settings: "{mvn-settings}"
+          pom: "{docker-pom}"
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: "{mvn-profile}"
+          mvn-params: "{mvn-params}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for building & pushing docker images
-      #
-      # The purpose of this job template is to run:
-      #  1. login to the docker registry
-      #  2. inject a version.properties file and set versions
-      #  3. run a docker push
-      #
-      # Required Variables:
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     profile:   the docker profile defined in the pom
-      #     maven-properties: properties passed to maven
-
-      <<: *docker_version_java_defaults
-      name: "{project-name}-{stream}-docker-version-java-daily"
-      id: "docker-version-java-daily"
-      node: "{build-node}"
-      wrappers:
-          - infra-wrappers-docker-build:
-                build-timeout: "{build-timeout}"
+    # Job template for building & pushing docker images
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. inject a version.properties file and set versions
+    #  3. run a docker push
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     profile:   the docker profile defined in the pom
+    #     maven-properties: properties passed to maven
+
+    <<: *docker_version_java_defaults
+    name: "{project-name}-{stream}-docker-version-java-daily"
+    id: "docker-version-java-daily"
+    node: "{build-node}"
+    wrappers:
+      - infra-wrappers-docker-build:
+          build-timeout: "{build-timeout}"
 
 - job-template:
-      # Job template for building & pushing docker images for AAI specific repos
-      #
-      # The purpose of this job template is to run:
-      #  1. login to the docker registry
-      #  2. run maven goals
-      #  3. run include-docker-push.sh
-      #
-      # Required Variables:
-      #     pom:       name/location of the pom.xml file relative to the workspace
-      #     maven-properties: properties passed to maven
-
-      name: "{project-name}-{stream}-aai-docker-java-daily"
-      project-type: freestyle
-      node: "{build-node}"
-      docker-image-name: ""
-      disabled: false
-      java-version: "openjdk8"
-      properties:
-          - infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      parameters:
-          - infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                refspec: "refs/heads/{branch}"
-                artifacts: "{archive-artifacts}"
-          - maven-exec:
-                maven-version: "{maven-version}"
-          - docker-image-name:
-                docker-image-name: "{docker-image-name}"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          # 12 AM UTC
-          - timed: "@daily"
-          - gerrit-trigger-release-manually:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-
-      builders:
-          - lf-infra-pre-build
-          - lf-update-java-alternatives:
-                java-version: "{java-version}"
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - docker-login
-
-          - maven-target:
-                maven-version: "{maven-version}"
-                pom: "pom.xml"
-                goals: "clean install -DskipTests -B
-                    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-
-          - maven-target:
-                maven-version: "{maven-version}"
-                pom: "{pom}"
-                goals: "{mvn-goals}"
-                settings: "{mvn-settings}"
-                settings-type: cfp
-                global-settings: "global-settings"
-                global-settings-type: cfp
-                properties:
-                    - maven.test.skip=true
-                    - docker.pull.registry=nexus3.onap.org:10001
-                    - docker.push.registry=nexus3.onap.org:10003
-
-          - shell: !include-raw-escape: include-docker-push.sh
-
-      publishers:
-          - lf-infra-publish
+    # Job template for building & pushing docker images for AAI specific repos
+    #
+    # The purpose of this job template is to run:
+    #  1. login to the docker registry
+    #  2. run maven goals
+    #  3. run include-docker-push.sh
+    #
+    # Required Variables:
+    #     pom:       name/location of the pom.xml file relative to the workspace
+    #     maven-properties: properties passed to maven
+
+    name: "{project-name}-{stream}-aai-docker-java-daily"
+    project-type: freestyle
+    node: "{build-node}"
+    docker-image-name: ""
+    disabled: false
+    java-version: "openjdk8"
+    properties:
+      - infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
+      - maven-exec:
+          maven-version: "{maven-version}"
+      - docker-image-name:
+          docker-image-name: "{docker-image-name}"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      # 12 AM UTC
+      - timed: "@daily"
+      - gerrit-trigger-release-manually:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - docker-login
+
+      - maven-target:
+          maven-version: "{maven-version}"
+          pom: "pom.xml"
+          goals: "clean install -DskipTests -B
+            -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+
+      - maven-target:
+          maven-version: "{maven-version}"
+          pom: "{pom}"
+          goals: "{mvn-goals}"
+          settings: "{mvn-settings}"
+          settings-type: cfp
+          global-settings: "global-settings"
+          global-settings-type: cfp
+          properties:
+            - maven.test.skip=true
+            - docker.pull.registry=nexus3.onap.org:10001
+            - docker.push.registry=nexus3.onap.org:10003
+
+      - shell: !include-raw-escape: include-docker-push.sh
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      # Job template for Java merge jobs for SDC specific repos
-      #
-      # The purpose of this job template is to run:
-      # 1. maven clean deploy
-      #
-      # Required Variables:
-      #     branch:    git branch (eg. stable/lithium or master)
-
-      <<: *merge_java_defaults
-      name: "{project-name}-{stream}-sdc-merge-java"
-
-      node: "{build-node}"
-      build-timeout: 120
-
-      builders:
-          - lf-infra-pre-build
-          - lf-update-java-alternatives:
-                java-version: "{java-version}"
-          - provide-maven-settings:
-                global-settings-file: "global-settings"
-                settings-file: "{mvn-settings}"
-
-          - docker-login
-
-          - maven-docker-push-daily:
-                maven-version: "{maven-version}"
-                mvn-settings: "{mvn-settings}"
-                pom: "{docker-pom}"
-                # use default as mvn-profile if profile is not needed
-                mvn-profile: "{mvn-profile}"
-                mvn-params: ""
+    # Job template for Java merge jobs for SDC specific repos
+    #
+    # The purpose of this job template is to run:
+    # 1. maven clean deploy
+    #
+    # Required Variables:
+    #     branch:    git branch (eg. stable/lithium or master)
+
+    <<: *merge_java_defaults
+    name: "{project-name}-{stream}-sdc-merge-java"
+
+    node: "{build-node}"
+    build-timeout: 120
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: "{java-version}"
+      - provide-maven-settings:
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+
+      - docker-login
+
+      - maven-docker-push-daily:
+          maven-version: "{maven-version}"
+          mvn-settings: "{mvn-settings}"
+          pom: "{docker-pom}"
+          # use default as mvn-profile if profile is not needed
+          mvn-profile: "{mvn-profile}"
+          mvn-params: ""
 
 - job-template:
-      # Job template for Java merge jobs on multiple architectures
-      #
-      # The purpose of this job template is to:
-      # 1. Run parallel {project-name}-{stream}-verify-java jobs for each supported architecture
-      # 2. Build and push a docker manifest list for the images created by
-      #    the previous jobs
-
-      name: "{project-name}-multiarch-{stream}-merge-java"
-      node: "{build-node}"
-      project-type: multijob
-      disabled: "{obj:disabled}"
-      pattern: "**"
-
-      parameters:
-          - lf-infra-parameters:
-                project: "{project}"
-                stream: "{stream}"
-                branch: "{branch}"
-          - string:
-                name: DOCKER_REGISTRY
-                default: "none"
-          - string:
-                name: DOCKERHUB_REGISTRY
-                default: "registry-1.docker.io"
-
-      properties:
-          - throttle:
-                max-per-node: 1
-                option: "project"
-          - build-blocker:
-                use-build-blocker: true
-                blocking-jobs:
-                    - "{project-name}-.*-merge-.*"
-                blocking-level: "NODE"
-
-      scm:
-          - gerrit-trigger-scm:
-                refspec: ""
-                choosing-strategy: "default"
-                submodule-recursive: "{submodule-recursive}"
-
-      wrappers:
-          - infra-wrappers:
-                build-timeout: "{build-timeout}"
-
-      triggers:
-          - gerrit-trigger-patch-merged:
-                server: "{server-name}"
-                project: "{project}"
-                branch: "{branch}"
-                files: "{pattern}"
-
-      builders:
-          - multijob:
-                name: "build docker images"
-                condition: ALWAYS
-                execution-type: PARALLEL
-                projects:
-                    - name: "{project-name}-amd64-{stream}-merge-java"
-                      kill-phase-on: FAILURE
-                      current-parameters: true
-                    - name: "{project-name}-arm64-{stream}-merge-java"
-                      kill-phase-on: NEVER
-                      current-parameters: true
-          - multijob:
-                name: "publish docker manifest"
-                condition: SUCCESSFUL
-                execution-type: PARALLEL
-                projects:
-                    - name: "{project-name}-docker-manifest-{stream}"
-                      current-parameters: true
-                      predefined-parameters: |
-                          PARENT_JOB_NAME=$JOB_NAME
-                          DOCKERHUB_REGISTRY=docker.io
+    # Job template for Java merge jobs on multiple architectures
+    #
+    # The purpose of this job template is to:
+    # 1. Run parallel {project-name}-{stream}-verify-java jobs for each supported architecture
+    # 2. Build and push a docker manifest list for the images created by
+    #    the previous jobs
+
+    name: "{project-name}-multiarch-{stream}-merge-java"
+    node: "{build-node}"
+    project-type: multijob
+    disabled: "{obj:disabled}"
+    pattern: "**"
+
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
+      - string:
+          name: DOCKER_REGISTRY
+          default: "none"
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: "registry-1.docker.io"
+
+    properties:
+      - throttle:
+          max-per-node: 1
+          option: "project"
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - "{project-name}-.*-merge-.*"
+          blocking-level: "NODE"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: "{build-timeout}"
+
+    triggers:
+      - gerrit-trigger-patch-merged:
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
+
+    builders:
+      - multijob:
+          name: "build docker images"
+          condition: ALWAYS
+          execution-type: PARALLEL
+          projects:
+            - name: "{project-name}-amd64-{stream}-merge-java"
+              kill-phase-on: FAILURE
+              current-parameters: true
+            - name: "{project-name}-arm64-{stream}-merge-java"
+              kill-phase-on: NEVER
+              current-parameters: true
+      - multijob:
+          name: "publish docker manifest"
+          condition: SUCCESSFUL
+          execution-type: PARALLEL
+          projects:
+            - name: "{project-name}-docker-manifest-{stream}"
+              current-parameters: true
+              predefined-parameters: |
+                PARENT_JOB_NAME=$JOB_NAME
+                DOCKERHUB_REGISTRY=docker.io
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index d3ba821f8..c62c99cb2 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -1,69 +1,69 @@
 ---
 - project:
-      name: holmes-project-view
-      project-name: holmes
-      views:
-          - project-view
+    name: holmes-project-view
+    project-name: holmes
+    views:
+      - project-view
 
 - project:
-      name: holmes-common
-      project-name: "holmes-common"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-                java-version: openjdk11
-                sbom-generator: true
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-                java-version: openjdk11
-      project: "holmes/common"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "holmes-common-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
-      java-version: openjdk11
+    name: holmes-common
+    project-name: "holmes-common"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+          java-version: openjdk11
+          sbom-generator: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+          java-version: openjdk11
+    project: "holmes/common"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "holmes-common-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
-      name: holmes-common-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-builder-4c-4g
-      project: "holmes/common"
-      project-name: "holmes-common"
-      branch: "master"
-      mvn-settings: "holmes-common-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-      java-version: openjdk11
+    name: holmes-common-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-builder-4c-4g
+    project: "holmes/common"
+    project-name: "holmes-common"
+    branch: "master"
+    mvn-settings: "holmes-common-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk11
 
 - project:
-      name: holmes-common-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: holmes/common
-      project-name: "holmes-common"
-      branch: "master"
-      mvn-settings: "holmes-common-settings"
-      java-version: openjdk11
+    name: holmes-common-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: holmes/common
+    project-name: "holmes-common"
+    branch: "master"
+    mvn-settings: "holmes-common-settings"
+    java-version: openjdk11
 
 - project:
-      name: holmes-common-info
-      project-name: holmes-common
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: holmes/common
-      branch: master
+    name: holmes-common-info
+    project-name: holmes-common
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: holmes/common
+    branch: master
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 4341dfadb..bb046212c 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -1,69 +1,69 @@
 ---
 - project:
-      name: holmes-engine-management
-      project-name: "holmes-engine-management"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-                java-version: openjdk11
-                sbom-generator: true
-          - "{project-name}-{stream}-docker-java-daily":
-                mvn-params: "-Dmaven.test.skip=true"
-                build-node: ubuntu1804-docker-8c-8g
-                java-version: openjdk11
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-                java-version: openjdk11
-      project: "holmes/engine-management"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "holmes-engine-management-settings"
-      files: "**"
-      archive-artifacts: ""
-      docker-pom: "pom.xml"
-      mvn-profile: docker
-      build-node: ubuntu1804-builder-4c-4g
-      java-version: openjdk11
+    name: holmes-engine-management
+    project-name: "holmes-engine-management"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+          java-version: openjdk11
+          sbom-generator: true
+      - "{project-name}-{stream}-docker-java-daily":
+          mvn-params: "-Dmaven.test.skip=true"
+          build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+          java-version: openjdk11
+    project: "holmes/engine-management"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "holmes-engine-management-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
+    mvn-profile: docker
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
-      name: holmes-engine-management-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-builder-4c-4g
-      project: "holmes/engine-management"
-      project-name: "holmes-engine-management"
-      branch: "master"
-      mvn-settings: "holmes-engine-management-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-      java-version: openjdk11
+    name: holmes-engine-management-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-builder-4c-4g
+    project: "holmes/engine-management"
+    project-name: "holmes-engine-management"
+    branch: "master"
+    mvn-settings: "holmes-engine-management-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk11
 
 - project:
-      name: holmes-engine-management-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: holmes/engine-management
-      project-name: "holmes-engine-management"
-      branch: "master"
-      mvn-settings: "holmes-engine-management-settings"
-      java-version: openjdk11
+    name: holmes-engine-management-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: holmes/engine-management
+    project-name: "holmes-engine-management"
+    branch: "master"
+    mvn-settings: "holmes-engine-management-settings"
+    java-version: openjdk11
 
 - project:
-      name: holmes-engine-management-info
-      project-name: holmes-engine-management
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: holmes/engine-management
-      branch: master
+    name: holmes-engine-management-info
+    project-name: holmes-engine-management
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: holmes/engine-management
+    branch: master
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 82fb6f599..ff7072889 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -1,69 +1,69 @@
 ---
 - project:
-      name: holmes-rule-management
-      project-name: "holmes-rule-management"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-                java-version: openjdk11
-                sbom-generator: true
-          - "{project-name}-{stream}-docker-java-daily":
-                mvn-params: "-Dmaven.test.skip=true"
-                build-node: ubuntu1804-docker-8c-8g
-                java-version: openjdk11
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-                java-version: openjdk11
-      project: "holmes/rule-management"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "holmes-rule-management-settings"
-      files: "**"
-      archive-artifacts: ""
-      docker-pom: "pom.xml"
-      mvn-profile: docker
-      build-node: ubuntu1804-builder-4c-4g
-      java-version: openjdk11
+    name: holmes-rule-management
+    project-name: "holmes-rule-management"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+          java-version: openjdk11
+          sbom-generator: true
+      - "{project-name}-{stream}-docker-java-daily":
+          mvn-params: "-Dmaven.test.skip=true"
+          build-node: ubuntu1804-docker-8c-8g
+          java-version: openjdk11
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+          java-version: openjdk11
+    project: "holmes/rule-management"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "holmes-rule-management-settings"
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
+    mvn-profile: docker
+    build-node: ubuntu1804-builder-4c-4g
+    java-version: openjdk11
 
 - project:
-      name: holmes-rule-management-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-builder-4c-4g
-      project: "holmes/rule-management"
-      project-name: "holmes-rule-management"
-      branch: "master"
-      mvn-settings: "holmes-rule-management-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-      java-version: openjdk11
+    name: holmes-rule-management-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-builder-4c-4g
+    project: "holmes/rule-management"
+    project-name: "holmes-rule-management"
+    branch: "master"
+    mvn-settings: "holmes-rule-management-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk11
 
 - project:
-      name: holmes-rule-management-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: holmes/rule-management
-      project-name: "holmes-rule-management"
-      branch: "master"
-      mvn-settings: "holmes-rule-management-settings"
-      java-version: openjdk11
+    name: holmes-rule-management-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: holmes/rule-management
+    project-name: "holmes-rule-management"
+    branch: "master"
+    mvn-settings: "holmes-rule-management-settings"
+    java-version: openjdk11
 
 - project:
-      name: holmes-rule-management-info
-      project-name: holmes-rule-management
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: holmes/rule-management
-      branch: master
+    name: holmes-rule-management-info
+    project-name: holmes-rule-management
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: holmes/rule-management
+    branch: master
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index 951409ef4..9c832c683 100644
--- a/jjb/lab/lab-templates.yaml
+++ b/jjb/lab/lab-templates.yaml
@@ -1,35 +1,35 @@
 ---
 - job-template:
-      name: "lab-{job-name}"
-      description: "{job-desc}"
-      disabled: false
-      project-type: freestyle
-      build-node: ubuntu1804-builder-4c-4g
+    name: "lab-{job-name}"
+    description: "{job-desc}"
+    disabled: false
+    project-type: freestyle
+    build-node: ubuntu1804-builder-4c-4g
 
-      properties:
-          - lf-infra-properties:
-                project: "integration"
-                build-days-to-keep: "{build-days-to-keep}"
+    properties:
+      - lf-infra-properties:
+          project: "integration"
+          build-days-to-keep: "{build-days-to-keep}"
 
-      parameters:
-          - string:
-                name: LOG_DIR_URL
-                description: "URL for the log directory produced by the external job"
-          - string:
-                name: SRC_BUILD_URL
-                description: "URL for the external Jenkins build triggering this build"
+    parameters:
+      - string:
+          name: LOG_DIR_URL
+          description: "URL for the log directory produced by the external job"
+      - string:
+          name: SRC_BUILD_URL
+          description: "URL for the external Jenkins build triggering this build"
 
-      wrappers:
-          - lf-infra-wrappers:
-                build-timeout: "{build-timeout}"
-                jenkins-ssh-credential: "{jenkins-ssh-credential}"
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
-      builders:
-          - shell: !include-raw:
-                - include-raw-lab-retrieve-logs.sh
+    builders:
+      - shell: !include-raw:
+          - include-raw-lab-retrieve-logs.sh
 
-      publishers:
-          - integration-robot:
-                unstable-if: 60.0
-                pass-if: 100.0
-          - lf-infra-publish
+    publishers:
+      - integration-robot:
+          unstable-if: 60.0
+          pass-if: 100.0
+      - lf-infra-publish
diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
index d343f72e0..2de7321de 100644
--- a/jjb/lab/lab.yaml
+++ b/jjb/lab/lab.yaml
@@ -1,12 +1,12 @@
 ---
 - project:
-      name: lab
-      jobs:
-          - "lab-{job-name}"
-      job-name:
-          - "windriver-oom-daily":
-                job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Daily tenant"
-          - "windriver-oom-staging-daily":
-                job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Staging-Daily tenant"
-          - "tlab-oom-daily":
-                job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant"
+    name: lab
+    jobs:
+      - "lab-{job-name}"
+    job-name:
+      - "windriver-oom-daily":
+          job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Daily tenant"
+      - "windriver-oom-staging-daily":
+          job-desc: "OOM-based deployment into Wind River lab Integration-OOM-Staging-Daily tenant"
+      - "tlab-oom-daily":
+          job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant"
diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml
index ee58beed5..da831e248 100644
--- a/jjb/lf-infra-releasedockerhub.yaml
+++ b/jjb/lf-infra-releasedockerhub.yaml
@@ -1,65 +1,65 @@
 ---
 - builder:
-      name: lf-onap-releasedockerhub-macro
-      builders:
-          - shell: !include-raw-escape:
-                - ../shell/run_releasedockerhub.sh
+    name: lf-onap-releasedockerhub-macro
+    builders:
+      - shell: !include-raw-escape:
+          - ../shell/run_releasedockerhub.sh
 
 - job:
-      name: lf-onap-release-docker-hub
-      build-timeout: 90
+    name: lf-onap-release-docker-hub
+    build-timeout: 90
 
-      project-type: freestyle
-      node: ubuntu1804-docker-8c-8g ## Probably don't need this much
-      disable-job: false
-      disabled: "{disable-job}"
+    project-type: freestyle
+    node: ubuntu1804-docker-8c-8g ## Probably don't need this much
+    disable-job: false
+    disabled: "{disable-job}"
 
-      # Runs once a day
-      triggers:
-          - timed: "@daily"
+    # Runs once a day
+    triggers:
+      - timed: "@daily"
 
-      #   Define needed parameters for lf-infra-docker-login
-      parameters:
-          - string:
-                name: DOCKER_REGISTRY
-                default: "nexus3.onap.org"
-          - string:
-                name: REGISTRY_PORTS
-                default: "10002"
-          - string:
-                name: DOCKERHUB_REGISTRY
-                default: "docker.io"
+    #   Define needed parameters for lf-infra-docker-login
+    parameters:
+      - string:
+          name: DOCKER_REGISTRY
+          default: "nexus3.onap.org"
+      - string:
+          name: REGISTRY_PORTS
+          default: "10002"
+      - string:
+          name: DOCKERHUB_REGISTRY
+          default: "docker.io"
 
-          #   Define needed parameters for lf-onap-releasedockerhub-macro
-          - string:
-                name: RELEASEDOCKERHUB_ORG
-                default: "onap"
-                description: ""
-          - string:
-                name: RELEASEDOCKERHUB_REPO
-                default: ""
-                description: "Only match repos that contains this string"
-          - string:
-                name: RELEASEDOCKERHUB_EXACT
-                default: ""
-                description: "Repo has to exactly match RELEASEDOCKERHUB_REPO "
-          - string:
-                name: RELEASEDOCKERHUB_SUMMARY
-                default: "Yes"
-                # yamllint disable-line rule:line-length
-                description: "Provides a brief statistic summary of what it found, and what it should do. Activate with Yes"
-          - string:
-                name: RELEASEDOCKERHUB_VERBOSE
-                default: ""
-                description: "Provides a verbose output of the operations. Activate with Yes"
-          - string:
-                name: RELEASEDOCKERHUB_COPY
-                default: "Yes"
-                description: "If a copy operation should be done from Nexus3 to docker hub. Activate with Yes"
+      #   Define needed parameters for lf-onap-releasedockerhub-macro
+      - string:
+          name: RELEASEDOCKERHUB_ORG
+          default: "onap"
+          description: ""
+      - string:
+          name: RELEASEDOCKERHUB_REPO
+          default: ""
+          description: "Only match repos that contains this string"
+      - string:
+          name: RELEASEDOCKERHUB_EXACT
+          default: ""
+          description: "Repo has to exactly match RELEASEDOCKERHUB_REPO "
+      - string:
+          name: RELEASEDOCKERHUB_SUMMARY
+          default: "Yes"
+          # yamllint disable-line rule:line-length
+          description: "Provides a brief statistic summary of what it found, and what it should do. Activate with Yes"
+      - string:
+          name: RELEASEDOCKERHUB_VERBOSE
+          default: ""
+          description: "Provides a verbose output of the operations. Activate with Yes"
+      - string:
+          name: RELEASEDOCKERHUB_COPY
+          default: "Yes"
+          description: "If a copy operation should be done from Nexus3 to docker hub. Activate with Yes"
 
-      builders:
-          - lf-infra-pre-build ## shell/python-tools-install.sh
-          - lf-infra-docker-login:
-                global-settings-file: "global-settings"
-                settings-file: "onap-releasedockerhub-authz-settings"
-          - lf-onap-releasedockerhub-macro
+    builders:
+      - lf-infra-pre-build ## shell/python-tools-install.sh
+      - lf-infra-docker-login:
+          global-settings-file: "global-settings"
+          settings-file: "onap-releasedockerhub-authz-settings"
+      - lf-onap-releasedockerhub-macro
diff --git a/jjb/modeling/modeling-etsicatalog-csit.yaml b/jjb/modeling/modeling-etsicatalog-csit.yaml
index 4d2248d41..900bd9e49 100644
--- a/jjb/modeling/modeling-etsicatalog-csit.yaml
+++ b/jjb/modeling/modeling-etsicatalog-csit.yaml
@@ -1,14 +1,14 @@
 ---
 - project:
-      name: modeling-etsicatalog-csit
-      jobs:
-          - "{project-name}-{stream}-verify-csit-{functionality}"
-          - "{project-name}-{stream}-csit-{functionality}"
-      project-name: "modeling-etsicatalog"
-      recipients: "denghui12@huawei.com"
-      stream: "master"
-      functionality:
-          - "sanity-check":
-                trigger_jobs: "modeling-etsicatalog-master-docker-java-version-shell-daily"
-      robot-options: ""
-      branch: "master"
+    name: modeling-etsicatalog-csit
+    jobs:
+      - "{project-name}-{stream}-verify-csit-{functionality}"
+      - "{project-name}-{stream}-csit-{functionality}"
+    project-name: "modeling-etsicatalog"
+    recipients: "denghui12@huawei.com"
+    stream: "master"
+    functionality:
+      - "sanity-check":
+          trigger_jobs: "modeling-etsicatalog-master-docker-java-version-shell-daily"
+    robot-options: ""
+    branch: "master"
diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml
index bae65ed3a..562068374 100644
--- a/jjb/modeling/modeling-etsicatalog.yaml
+++ b/jjb/modeling/modeling-etsicatalog.yaml
@@ -1,70 +1,70 @@
 ---
 - project:
-      name: modeling-etsicatalog
-      project-name: "modeling-etsicatalog"
-      project: "modeling/etsicatalog"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "modeling-etsicatalog-settings"
-      subproject:
-          - "etsicatalog":
-                path: "."
-                pattern: "**"
-      jobs:
-          - "{project-name}-{stream}-{subproject}-verify-python"
-          - "{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
-                sbom-generator: true
+    name: modeling-etsicatalog
+    project-name: "modeling-etsicatalog"
+    project: "modeling/etsicatalog"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
+    subproject:
+      - "etsicatalog":
+          path: "."
+          pattern: "**"
+    jobs:
+      - "{project-name}-{stream}-{subproject}-verify-python"
+      - "{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
+          sbom-generator: true
 
-          - "{project-name}-{stream}-docker-java-version-shell-daily":
-                docker-pom: "pom.xml"
-                mvn-goals: "install"
-                script: !include-raw-escape: "build-modeling-etsicatalog-docker-image.sh"
-                build-node: ubuntu1804-docker-8c-8g
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+      - "{project-name}-{stream}-docker-java-version-shell-daily":
+          docker-pom: "pom.xml"
+          mvn-goals: "install"
+          script: !include-raw-escape: "build-modeling-etsicatalog-docker-image.sh"
+          build-node: ubuntu1804-docker-8c-8g
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: modeling-etsicatalog-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-builder-4c-4g
-      project: "modeling/etsicatalog"
-      project-name: "modeling-etsicatalog"
-      branch: "master"
-      mvn-settings: "modeling-etsicatalog-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: modeling-etsicatalog-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-builder-4c-4g
+    project: "modeling/etsicatalog"
+    project-name: "modeling-etsicatalog"
+    branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: modeling-etsicatalog-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: modeling/etsicatalog
-      project-name: "modeling-etsicatalog"
-      build-node: centos8-redis-4c-4g
-      branch: "master"
-      mvn-settings: "modeling-etsicatalog-settings"
+    name: modeling-etsicatalog-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: modeling/etsicatalog
+    project-name: "modeling-etsicatalog"
+    build-node: centos8-redis-4c-4g
+    branch: "master"
+    mvn-settings: "modeling-etsicatalog-settings"
 
 - project:
-      name: modeling-etsicatalog-info
-      project-name: modeling-etsicatalog
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: modeling/etsicatalog
-      branch: master
+    name: modeling-etsicatalog-info
+    project-name: modeling-etsicatalog
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: modeling/etsicatalog
+    branch: master
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 9678a4dfc..6fe325758 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -1,72 +1,72 @@
 ---
 - project:
-      name: msb-project-view
-      project-name: msb
-      views:
-          - project-view
+    name: msb-project-view
+    project-name: msb
+    views:
+      - project-view
 
 - project:
-      name: msb-apigateway
-      project-name: "msb-apigateway"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sbom-generator: true
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                sbom-generator: true
-                build-node: ubuntu1804-docker-8c-8g
-                maven-versions-plugin: true
-                mvn-pom: "distributions/msb-apigateway/pom.xml"
-                container-public-registry: "nexus3.onap.org:10001"
-                container-staging-registry: "nexus3.onap.org:10003"
-                mvn-params: "-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker"
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      project: "msb/apigateway"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "msb-apigateway-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: msb-apigateway
+    project-name: "msb-apigateway"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-pom: "distributions/msb-apigateway/pom.xml"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "msb/apigateway"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "msb-apigateway-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: msb-apigateway-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-builder-4c-4g
-      project: "msb/apigateway"
-      project-name: "msb-apigateway"
-      branch: "master"
-      mvn-settings: "msb-apigateway-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: msb-apigateway-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-builder-4c-4g
+    project: "msb/apigateway"
+    project-name: "msb-apigateway"
+    branch: "master"
+    mvn-settings: "msb-apigateway-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: msb-apigateway-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: msb/apigateway
-      project-name: "msb-apigateway"
-      branch: "master"
-      mvn-settings: "msb-apigateway-settings"
+    name: msb-apigateway-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: msb/apigateway
+    project-name: "msb-apigateway"
+    branch: "master"
+    mvn-settings: "msb-apigateway-settings"
 
 - project:
-      name: msb-apigateway-info
-      project-name: msb-apigateway
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: msb/apigateway
-      branch: master
+    name: msb-apigateway-info
+    project-name: msb-apigateway
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: msb/apigateway
+    branch: master
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 7bc8eb14e..f5f4ca60a 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -1,66 +1,66 @@
 ---
 - project:
-      name: msb-discovery
-      project-name: "msb-discovery"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sbom-generator: true
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-          - gerrit-maven-docker-stage:
-                sbom-generator: true
-                build-node: ubuntu1804-docker-8c-8g
-                maven-versions-plugin: true
-                container-public-registry: "nexus3.onap.org:10001"
-                container-staging-registry: "nexus3.onap.org:10003"
-                mvn-pom: "distributions/msb-discovery/pom.xml"
-                mvn-params: "-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker"
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      project: "msb/discovery"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "msb-discovery-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: msb-discovery
+    project-name: "msb-discovery"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-pom: "distributions/msb-discovery/pom.xml"
+          mvn-params: "-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "msb/discovery"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "msb-discovery-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: msb-discovery-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-builder-4c-4g
-      project: "msb/discovery"
-      project-name: "msb-discovery"
-      branch: "master"
-      mvn-settings: "msb-discovery-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: msb-discovery-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-builder-4c-4g
+    project: "msb/discovery"
+    project-name: "msb-discovery"
+    branch: "master"
+    mvn-settings: "msb-discovery-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: msb-discovery-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: msb/discovery
-      project-name: "msb-discovery"
-      branch: "master"
-      mvn-settings: "msb-discovery-settings"
+    name: msb-discovery-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: msb/discovery
+    project-name: "msb-discovery"
+    branch: "master"
+    mvn-settings: "msb-discovery-settings"
 
 - project:
-      name: msb-discovery-info
-      project-name: msb-discovery
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: msb/discovery
-      branch: master
+    name: msb-discovery-info
+    project-name: msb-discovery
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: msb/discovery
+    branch: master
diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml
index d793ec079..2f25b1ea4 100644
--- a/jjb/msb/msb-java-sdk.yaml
+++ b/jjb/msb/msb-java-sdk.yaml
@@ -1,56 +1,56 @@
 ---
 - project:
-      name: msb-java-sdk
-      project-name: "msb-java-sdk"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sbom-generator: true
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-      project: "msb/java-sdk"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "msb-java-sdk-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: msb-java-sdk
+    project-name: "msb-java-sdk"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+    project: "msb/java-sdk"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "msb-java-sdk-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: msb-java-sdk-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-builder-4c-4g
-      project: "msb/java-sdk"
-      project-name: "msb-java-sdk"
-      branch: "master"
-      mvn-settings: "msb-java-sdk-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: msb-java-sdk-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-builder-4c-4g
+    project: "msb/java-sdk"
+    project-name: "msb-java-sdk"
+    branch: "master"
+    mvn-settings: "msb-java-sdk-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: msb-java-sdk-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: msb/java-sdk
-      project-name: "msb-java-sdk"
-      branch: "master"
-      mvn-settings: "msb-java-sdk-settings"
+    name: msb-java-sdk-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: msb/java-sdk
+    project-name: "msb-java-sdk"
+    branch: "master"
+    mvn-settings: "msb-java-sdk-settings"
 
 - project:
-      name: msb-java-sdk-info
-      project-name: msb-java-sdk
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: msb/java-sdk
-      branch: master
+    name: msb-java-sdk-info
+    project-name: msb-java-sdk
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: msb/java-sdk
+    branch: master
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 7aaa31052..c6c99d870 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -1,56 +1,56 @@
 ---
 - project:
-      name: msb-swagger-sdk
-      project-name: "msb-swagger-sdk"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sbom-generator: true
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-      project: "msb/swagger-sdk"
-      stream:
-          - "master":
-                branch: "master"
-      mvn-settings: "msb-swagger-sdk-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: msb-swagger-sdk
+    project-name: "msb-swagger-sdk"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+    project: "msb/swagger-sdk"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "msb-swagger-sdk-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: msb-swagger-sdk-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-builder-4c-4g
-      project: "msb/swagger-sdk"
-      project-name: "msb-swagger-sdk"
-      branch: "master"
-      mvn-settings: "msb-swagger-sdk-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: msb-swagger-sdk-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-builder-4c-4g
+    project: "msb/swagger-sdk"
+    project-name: "msb-swagger-sdk"
+    branch: "master"
+    mvn-settings: "msb-swagger-sdk-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: msb-swagger-sdk-clm
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: msb/swagger-sdk
-      project-name: "msb-swagger-sdk"
-      branch: "master"
-      mvn-settings: "msb-swagger-sdk-settings"
+    name: msb-swagger-sdk-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: msb/swagger-sdk
+    project-name: "msb-swagger-sdk"
+    branch: "master"
+    mvn-settings: "msb-swagger-sdk-settings"
 
 - project:
-      name: msb-swagger-sdk-info
-      project-name: msb-swagger-sdk
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: msb/swagger-sdk
-      branch: master
+    name: msb-swagger-sdk-info
+    project-name: msb-swagger-sdk
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: msb/swagger-sdk
+    branch: master
diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml
index a60b713d8..2a2733afc 100644
--- a/jjb/multicloud/multicloud-framework.yaml
+++ b/jjb/multicloud/multicloud-framework.yaml
@@ -1,9 +1,9 @@
 ---
 - project:
-      name: multicloud-framework-info
-      project-name: multicloud-framework
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: multicloud/framework
-      branch: master
+    name: multicloud-framework-info
+    project-name: multicloud-framework
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: multicloud/framework
+    branch: master
diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 576f459e9..859926899 100644
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -1,28 +1,28 @@
 ---
 - project:
-      name: music-distributed-kv-store
-      project-name: "music-distributed-kv-store"
-      path: "src/dkv"
-      jobs:
-          - "{project-name}-{stream}-verify-golang"
-          - "{project-name}-{stream}-merge-golang"
-          - "{project-name}-{stream}-docker-golang-shell-daily":
-                script: !include-raw-escape: "build-music-distributed-kv-store-image.sh"
-      project: "music/distributed-kv-store"
-      stream:
-          - "master":
-                branch: "master"
-      artifact-type: "golang"
-      mvn-settings: "music-distributed-kv-store-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: music-distributed-kv-store
+    project-name: "music-distributed-kv-store"
+    path: "src/dkv"
+    jobs:
+      - "{project-name}-{stream}-verify-golang"
+      - "{project-name}-{stream}-merge-golang"
+      - "{project-name}-{stream}-docker-golang-shell-daily":
+          script: !include-raw-escape: "build-music-distributed-kv-store-image.sh"
+    project: "music/distributed-kv-store"
+    stream:
+      - "master":
+          branch: "master"
+    artifact-type: "golang"
+    mvn-settings: "music-distributed-kv-store-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: music-distributed-kv-store-info
-      project-name: music-distributed-kv-store
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: music/distributed-kv-store
-      branch: master
+    name: music-distributed-kv-store-info
+    project-name: music-distributed-kv-store
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: music/distributed-kv-store
+    branch: master
diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 6a2bb3fd0..7ec6146c0 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -1,38 +1,38 @@
 ---
 - project:
-      name: music-jar
-      project-name: "music"
-      subproject:
-          - "music-jar":
-                pom: "jar/pom.xml"
-                pattern: "jar/**"
-      jobs:
-          - "{project-name}-{stream}-{subproject}-verify-java"
-          - "{project-name}-{stream}-{subproject}-merge-java"
-          - gerrit-maven-stage:
-                sbom-generator: true
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-version-plugin: true
-                mvn-pom: "jar/pom.xml"
-                mvn-params: "-f jar/pom.xml"
-                pattern: "jar/**"
-      project: "music"
-      stream:
-          - "jar-master":
-                branch: "master"
-      mvn-settings: "music-settings"
-      files: "**"
-      archive-artifacts: ""
-      build-node: ubuntu1804-builder-4c-4g
+    name: music-jar
+    project-name: "music"
+    subproject:
+      - "music-jar":
+          pom: "jar/pom.xml"
+          pattern: "jar/**"
+    jobs:
+      - "{project-name}-{stream}-{subproject}-verify-java"
+      - "{project-name}-{stream}-{subproject}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-version-plugin: true
+          mvn-pom: "jar/pom.xml"
+          mvn-params: "-f jar/pom.xml"
+          pattern: "jar/**"
+    project: "music"
+    stream:
+      - "jar-master":
+          branch: "master"
+    mvn-settings: "music-settings"
+    files: "**"
+    archive-artifacts: ""
+    build-node: ubuntu1804-builder-4c-4g
 
 - project:
-      name: music-jar-clm
-      jobs:
-          - gerrit-maven-clm:
-                mvn-params: "-f jar/pom.xml"
-      nexus-iq-namespace: "onap-"
-      project: music
-      project-name: "music-jar"
-      branch: "master"
-      mvn-settings: "music-settings"
+    name: music-jar-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: "-f jar/pom.xml"
+    nexus-iq-namespace: "onap-"
+    project: music
+    project-name: "music-jar"
+    branch: "master"
+    mvn-settings: "music-settings"
diff --git a/jjb/onap-jjb/onap-pypi-template.yaml b/jjb/onap-jjb/onap-pypi-template.yaml
index d4cce22ab..557673db6 100644
--- a/jjb/onap-jjb/onap-pypi-template.yaml
+++ b/jjb/onap-jjb/onap-pypi-template.yaml
@@ -1,194 +1,194 @@
 ---
 # Job definition Anchors
 - _pypi_job_boiler_plate: &pypi_job_boiler_plate
-      name: pypi_job_boiler_plate
-
-      #####################
-      #   Job Variables   #
-      #####################
-
-      gerrit_merge_triggers:
-          - change-merged-event
-          - comment-added-contains-event:
-                comment-contains-value: pypi-remerge$
-
-      gerrit_release_trigger:
-          - comment-added-contains-event:
-                comment-contains-value: pypi-release$
-
-      gerrit_trigger_file_paths:
-          - compare-type: ANT
-            pattern: "**"
-
-      submodule-disable: false
-      submodule-timeout: 10
-
-      #####################
-      # Job Configuration #
-      #####################
-
-      project-type: freestyle
-      node: "{build-node}"
-
-      parameters:
-          - lf-infra-parameters:
-                project: "{project}"
-                branch: "{branch}"
-                stream: "{stream}"
-                lftools-version: "{lftools-version}"
-          - lf-infra-tox-parameters:
-                tox-dir: "{tox-dir}"
-                tox-envs: "{tox-envs}"
-
-      properties:
-          - lf-infra-properties:
-                build-days-to-keep: "{build-days-to-keep}"
-
-      scm:
-          - lf-infra-gerrit-scm:
-                jenkins-ssh-credential: "{jenkins-ssh-credential}"
-                git-url: "$GIT_URL/$PROJECT"
-                refspec: "$GERRIT_REFSPEC"
-                branch: "$GERRIT_BRANCH"
-                submodule-recursive: true
-                submodule-timeout: "{submodule-timeout}"
-                submodule-disable: "{submodule-disable}"
-                choosing-strategy: default
-
-      wrappers:
-          - lf-infra-wrappers:
-                build-timeout: "{build-timeout}"
-                jenkins-ssh-credential: "{jenkins-ssh-credential}"
-
-      publishers:
-          - lf-infra-publish
+    name: pypi_job_boiler_plate
+
+    #####################
+    #   Job Variables   #
+    #####################
+
+    gerrit_merge_triggers:
+      - change-merged-event
+      - comment-added-contains-event:
+          comment-contains-value: pypi-remerge$
+
+    gerrit_release_trigger:
+      - comment-added-contains-event:
+          comment-contains-value: pypi-release$
+
+    gerrit_trigger_file_paths:
+      - compare-type: ANT
+        pattern: "**"
+
+    submodule-disable: false
+    submodule-timeout: 10
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: "{build-node}"
+
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"
+      - lf-infra-tox-parameters:
+          tox-dir: "{tox-dir}"
+          tox-envs: "{tox-envs}"
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    scm:
+      - lf-infra-gerrit-scm:
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "$GIT_URL/$PROJECT"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: true
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    publishers:
+      - lf-infra-publish
 
 - job-template:
-      name: "{project-name}-python-staging-{stream}"
-
-      # Job template for PyPI staging jobs
-      # Daily Builds
-
-      <<: *pypi_job_boiler_plate
-
-      triggers:
-          - gerrit:
-                server-name: "{gerrit-server-name}"
-                trigger-on: "{obj:gerrit_merge_triggers}"
-                projects:
-                    - project-compare-type: ANT
-                      project-pattern: "{project}"
-                      branches:
-                          - branch-compare-type: ANT
-                            branch-pattern: "**/{branch}"
-                      file-paths: "{obj:gerrit_trigger_file_paths}"
-
-      builders:
-          - lf-infra-tox-install:
-                python-version: "{python-version}"
-          - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
-          - config-file-provider:
-                files:
-                    - file-id: pypirc
-                      target: "$HOME/.pypirc"
-          - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
-
-          - publish-pypi:
-                pypi-server: staging
+    name: "{project-name}-python-staging-{stream}"
+
+    # Job template for PyPI staging jobs
+    # Daily Builds
+
+    <<: *pypi_job_boiler_plate
+
+    triggers:
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: "{python-version}"
+      - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
+      - config-file-provider:
+          files:
+            - file-id: pypirc
+              target: "$HOME/.pypirc"
+      - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
+
+      - publish-pypi:
+          pypi-server: staging
 
 - job-template:
-      name: "{project-name}-python-release-{stream}"
-
-      # Job template for PyPI release jobs
-
-      <<: *pypi_job_boiler_plate
-
-      triggers:
-          - gerrit:
-                server-name: "{gerrit-server-name}"
-                trigger-on: "{obj:gerrit_release_trigger}"
-                projects:
-                    - project-compare-type: ANT
-                      project-pattern: "{project}"
-                      branches:
-                          - branch-compare-type: ANT
-                            branch-pattern: "**/{branch}"
-                      file-paths: "{obj:gerrit_trigger_file_paths}"
-
-      builders:
-          - lf-infra-tox-install:
-                python-version: "{python-version}"
-          - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
-          - config-file-provider:
-                files:
-                    - file-id: pypirc
-                      target: "$HOME/.pypirc"
-          - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
-
-          - publish-pypi:
-                pypi-server: release
+    name: "{project-name}-python-release-{stream}"
+
+    # Job template for PyPI release jobs
+
+    <<: *pypi_job_boiler_plate
+
+    triggers:
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_release_trigger}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: "{python-version}"
+      - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
+      - config-file-provider:
+          files:
+            - file-id: pypirc
+              target: "$HOME/.pypirc"
+      - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
+
+      - publish-pypi:
+          pypi-server: release
 
 - job-template:
-      name: "{project-name}-{subproject}-python-staging-{stream}"
-
-      # Job template for PyPI staging jobs
-      # Daily Builds
-
-      <<: *pypi_job_boiler_plate
-
-      triggers:
-          - gerrit:
-                server-name: "{gerrit-server-name}"
-                trigger-on: "{obj:gerrit_merge_triggers}"
-                projects:
-                    - project-compare-type: ANT
-                      project-pattern: "{project}"
-                      branches:
-                          - branch-compare-type: ANT
-                            branch-pattern: "**/{branch}"
-                      file-paths: "{obj:gerrit_trigger_file_paths}"
-
-      builders:
-          - lf-infra-tox-install:
-                python-version: "{python-version}"
-          - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
-          - config-file-provider:
-                files:
-                    - file-id: pypirc
-                      target: "$HOME/.pypirc"
-          - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
-
-          - publish-pypi:
-                pypi-server: staging
+    name: "{project-name}-{subproject}-python-staging-{stream}"
+
+    # Job template for PyPI staging jobs
+    # Daily Builds
+
+    <<: *pypi_job_boiler_plate
+
+    triggers:
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: "{python-version}"
+      - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
+      - config-file-provider:
+          files:
+            - file-id: pypirc
+              target: "$HOME/.pypirc"
+      - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
+
+      - publish-pypi:
+          pypi-server: staging
 
 - job-template:
-      name: "{project-name}-{subproject}-python-release-{stream}"
-
-      # Job template for PyPI release jobs
-
-      <<: *pypi_job_boiler_plate
-
-      triggers:
-          - gerrit:
-                server-name: "{gerrit-server-name}"
-                trigger-on: "{obj:gerrit_release_trigger}"
-                projects:
-                    - project-compare-type: ANT
-                      project-pattern: "{project}"
-                      branches:
-                          - branch-compare-type: ANT
-                            branch-pattern: "**/{branch}"
-                      file-paths: "{obj:gerrit_trigger_file_paths}"
-
-      builders:
-          - lf-infra-tox-install:
-                python-version: "{python-version}"
-          - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
-          - config-file-provider:
-                files:
-                    - file-id: pypirc
-                      target: "$HOME/.pypirc"
-          - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
-
-          - publish-pypi:
-                pypi-server: release
+    name: "{project-name}-{subproject}-python-release-{stream}"
+
+    # Job template for PyPI release jobs
+
+    <<: *pypi_job_boiler_plate
+
+    triggers:
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_release_trigger}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
+
+    builders:
+      - lf-infra-tox-install:
+          python-version: "{python-version}"
+      - shell: !include-raw-escape: ../global-jjb/shell/tox-run.sh
+      - config-file-provider:
+          files:
+            - file-id: pypirc
+              target: "$HOME/.pypirc"
+      - shell: !include-raw-escape: ../../shell/pypi-dist-build.sh
+
+      - publish-pypi:
+          pypi-server: release
diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index 2363bc136..08a35aceb 100644
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -7,45 +7,45 @@
 
 - project:
     name: policy-apex-pdp
-    project-name: 'policy-apex-pdp'
+    project-name: "policy-apex-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-         docker-pom: 'pom.xml'
-         mvn-profile: 'docker'
-         mvn-params: "-P docker"
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
+          mvn-params: "-P docker"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/apex-pdp'
+    project: "policy/apex-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-apex-pdp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -53,30 +53,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/apex-pdp'
-    project-name: 'policy-apex-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-apex-pdp-settings'
+    project: "policy/apex-pdp"
+    project-name: "policy-apex-pdp"
+    branch: "master"
+    mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-apex-pdp-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/apex-pdp
-    project-name: 'policy-apex-pdp'
+    project-name: "policy-apex-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-apex-pdp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-apex-pdp-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index ad11393e4..8e6b5c0a6 100644
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-api
-    project-name: 'policy-api'
+    project-name: "policy-api"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/api'
+    project: "policy/api"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-api-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-api-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/api'
-    project-name: 'policy-api'
-    branch: 'master'
-    mvn-settings: 'policy-api-settings'
+    project: "policy/api"
+    project-name: "policy-api"
+    branch: "master"
+    mvn-settings: "policy-api-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-api-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/api
-    project-name: 'policy-api'
+    project-name: "policy-api"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-api-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-api-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 75b32d74e..95f9f000b 100644
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -1,46 +1,46 @@
 ---
 - project:
     name: policy-clamp
-    project-name: 'policy-clamp'
+    project-name: "policy-clamp"
     jobs:
       - gerrit-maven-stage:
           build-node: centos8-docker-8c-8g
           sbom-generator: true
           maven-versions-plugin: true
           sign-artifacts: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-      - '{project-name}-{stream}-verify-java':
-          mvn-params: '-P docker'
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+          mvn-params: "-Dmaven.test.skip=true -P docker"
+      - "{project-name}-{stream}-verify-java":
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-16g
-      - '{project-name}-{stream}-merge-java':
+      - "{project-name}-{stream}-merge-java":
           build-node: ubuntu1804-docker-8c-16g
-          mvn-params: '-P docker'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/clamp'
+    project: "policy/clamp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-clamp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-clamp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -48,30 +48,30 @@
     jobs:
       - gerrit-maven-sonar:
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-docker-8c-8g
-    project: 'policy/clamp'
-    project-name: 'policy-clamp'
-    branch: 'master'
-    mvn-settings: 'policy-clamp-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "policy/clamp"
+    project-name: "policy-clamp"
+    branch: "master"
+    mvn-settings: "policy-clamp-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: policy-clamp-clm
     jobs:
       - gerrit-maven-clm:
-    nexus-iq-namespace: 'onap-'
-    project: 'policy/clamp'
-    project-name: 'policy-clamp'
+    nexus-iq-namespace: "onap-"
+    project: "policy/clamp"
+    project-name: "policy-clamp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-clamp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-clamp-settings"
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk11
 
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 222031d67..27f47585e 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -1,35 +1,35 @@
 ---
 - project:
     name: policy-common
-    project-name: 'policy-common'
+    project-name: "policy-common"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-Dmaven.test.skip=true"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/common'
+    project: "policy/common"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-common-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-common-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -37,30 +37,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/common'
-    project-name: 'policy-common'
-    branch: 'master'
-    mvn-settings: 'policy-common-settings'
+    project: "policy/common"
+    project-name: "policy-common"
+    branch: "master"
+    mvn-settings: "policy-common-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-common-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/common
-    project-name: 'policy-common'
+    project-name: "policy-common"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-common-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-common-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
index 26d3e3e07..b42b40258 100644
--- a/jjb/policy/policy-csit-jobs.yaml
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -1,47 +1,48 @@
+---
 - job-template:
-    name: '{project-name}-{stream}-project-csit-{functionality}'
+    name: "{project-name}-{stream}-project-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: '{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}"
       - integration-test-options:
-          test-options: '{functionality}'
+          test-options: "{functionality}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_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:
-      - timed: '@daily'
+      - 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-run-project-test
 
     publishers:
@@ -50,57 +51,57 @@
           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}-project-csit-verify-{functionality}'
+    name: "{project-name}-{stream}-project-csit-verify-{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: '{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}"
       - integration-test-options:
-          test-options: '{functionality}'
+          test-options: "{functionality}"
 
     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: '{project}'
-          branch: '{branch}'
-          files: '**/csit/**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**/csit/**"
 
     builders:
       - lf-infra-pre-build
       - lf-update-java-alternatives:
-          java-version: '{java-version}'
+          java-version: "{java-version}"
       - integration-run-project-test
 
     publishers:
@@ -109,7 +110,6 @@
           pass-if: 100.0
       - lf-infra-publish
       - email:
-          recipients: '{recipients}'
+          recipients: "{recipients}"
           notify-every-unstable-build: false
           send-to-individuals: true
-
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 237c32208..ee84572d3 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,218 +1,219 @@
+---
 - project:
     name: policy-distribution-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-distribution'
-    recipients: 'ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-distribution"
+    recipients: "ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'distribution'
+      - "distribution"
     trigger_jobs:
-      - 'policy-distribution-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-distribution-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-xacml-pdp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-xacml-pdp'
-    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-xacml-pdp"
+    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'xacml-pdp'
+      - "xacml-pdp"
     trigger_jobs:
-      - 'policy-xacml-pdp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-xacml-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-drools-applications-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-drools-applications'
-    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-drools-applications"
+    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'drools-applications'
+      - "drools-applications"
     trigger_jobs:
-      - 'policy-drools-applications-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-drools-applications-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-drools-pdp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-drools-pdp'
-    recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-drools-pdp"
+    recipients: "jrh3@att.com jorge.hernandez-herrero@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'drools-pdp'
+      - "drools-pdp"
     trigger_jobs:
-      - 'policy-drools-pdp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-drools-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-apex-pdp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-apex-pdp'
-    recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-apex-pdp"
+    recipients: "liam.fallon@est.tech ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'apex-pdp'
+      - "apex-pdp"
     trigger_jobs:
-      - 'policy-apex-pdp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-apex-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-pap-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-pap'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-pap"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'pap'
+      - "pap"
     trigger_jobs:
-      - 'policy-pap-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-pap-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-api-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-api'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-api"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'api'
+      - "api"
     trigger_jobs:
-      - 'policy-api-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-api-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-clamp-project-csit
     jobs:
-      - '{project-name}-{stream}-project-csit-verify-{functionality}'
-      - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-clamp'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-clamp"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
     functionality:
-      - 'clamp'
+      - "clamp"
     trigger_jobs:
-      - 'policy-clamp-{stream}-merge-java'
-      - 'policy-docker-{stream}-merge-java'
+      - "policy-clamp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
 
 - project:
     name: policy-apex-pdp-postgres-project-csit
     jobs:
-        - '{project-name}-{stream}-project-csit-verify-{functionality}'
-        - '{project-name}-{stream}-project-csit-{functionality}'
-    project-name: 'policy-apex-pdp'
-    recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
-    project: 'policy/docker'
+      - "{project-name}-{stream}-project-csit-verify-{functionality}"
+      - "{project-name}-{stream}-project-csit-{functionality}"
+    project-name: "policy-apex-pdp"
+    recipients: "jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com"
+    project: "policy/docker"
     stream:
-        - 'master':
-              branch: 'master'
-        - 'kohn':
-              branch: 'kohn'
+      - "master":
+          branch: "master"
+      - "kohn":
+          branch: "kohn"
     functionality:
-        - 'apex-pdp-postgres'
+      - "apex-pdp-postgres"
     trigger_jobs:
-        - 'policy-apex-pdp-{stream}-merge-java'
-        - 'policy-docker-{stream}-merge-java'
+      - "policy-apex-pdp-{stream}-merge-java"
+      - "policy-docker-{stream}-merge-java"
diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index e91fef856..8b022f890 100644
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-distribution
-    project-name: 'policy-distribution'
+    project-name: "policy-distribution"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/distribution'
+    project: "policy/distribution"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-distribution-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-distribution-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/distribution'
-    project-name: 'policy-distribution'
-    branch: 'master'
-    mvn-settings: 'policy-distribution-settings'
+    project: "policy/distribution"
+    project-name: "policy-distribution"
+    branch: "master"
+    mvn-settings: "policy-distribution-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-distribution-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/distribution
-    project-name: 'policy-distribution'
+    project-name: "policy-distribution"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-distribution-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-distribution-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml
index e26f0ec69..085b61ece 100644
--- a/jjb/policy/policy-docker-base-common.yaml
+++ b/jjb/policy/policy-docker-base-common.yaml
@@ -1,57 +1,54 @@
 ---
 - project:
     name: policy-docker-base-common
-    project-name: 'policy-docker'
+    project-name: "policy-docker"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
           mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
-    mvn-settings: 'policy-docker-settings'
+    mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     java-version: openjdk11
 
-    project: 'policy/docker'
+    project: "policy/docker"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-docker-settings'
-    mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-docker-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/docker
-    project-name: 'policy-docker'
+    project-name: "policy-docker"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-docker-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-docker-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     java-version: openjdk11
 
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index ddc280021..1c4c669e9 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -1,82 +1,81 @@
 ---
 - project:
     name: policy-drools-applications
-    project-name: 'policy-drools-applications'
+    project-name: "policy-drools-applications"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
           mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker  -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker  -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/drools-applications'
+    project: "policy/drools-applications"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-drools-applications-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
-
 - project:
     name: policy-drools-applications-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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/drools-applications'
-    project-name: 'policy-drools-applications'
-    branch: 'master'
-    mvn-settings: 'policy-drools-applications-settings'
+    project: "policy/drools-applications"
+    project-name: "policy-drools-applications"
+    branch: "master"
+    mvn-settings: "policy-drools-applications-settings"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     java-version: openjdk11
-    java-opts: '-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-applications-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/drools-applications
-    project-name: 'policy-drools-applications'
+    project-name: "policy-drools-applications"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-drools-applications-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-drools-applications-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
     mvn-version: "mvn36"
     maven-version: "mvn36"
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index bcdfe4916..46a348530 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-drools-pdp
-    project-name: 'policy-drools-pdp'
+    project-name: "policy-drools-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-profile: 'docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-profile: "docker"
           mvn-params: "-P docker"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker  -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker  -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/drools-pdp'
+    project: "policy/drools-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-drools-pdp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-docker-8c-8g
 
 - project:
@@ -47,31 +47,31 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/drools-pdp'
-    project-name: 'policy-drools-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
+    project: "policy/drools-pdp"
+    project-name: "policy-drools-pdp"
+    branch: "master"
+    mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-drools-pdp-clm
     jobs:
       - gerrit-maven-clm:
-          mvn-params: '-Dmaven.test.skip=true'
-    nexus-iq-namespace: 'onap-'
+          mvn-params: "-Dmaven.test.skip=true"
+    nexus-iq-namespace: "onap-"
     project: policy/drools-pdp
-    project-name: 'policy-drools-pdp'
+    project-name: "policy-drools-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-drools-pdp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-drools-pdp-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index dab10cce7..128098283 100644
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -1,43 +1,43 @@
 ---
 - project:
     name: policy-gui
-    project-name: 'policy-gui'
+    project-name: "policy-gui"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/gui'
+    project: "policy/gui"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-gui-settings'
+      - "master":
+          branch: "master"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-gui-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -45,31 +45,31 @@
     jobs:
       - gerrit-maven-sonar-prescan-script
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/gui'
-    project-name: 'policy-gui'
-    branch: 'master'
-    mvn-settings: 'policy-gui-settings'
+    project: "policy/gui"
+    project-name: "policy-gui"
+    branch: "master"
+    mvn-settings: "policy-gui-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh
 
 - project:
     name: policy-gui-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/gui
-    project-name: 'policy-gui'
+    project-name: "policy-gui"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-gui-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-gui-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 7fd34eabd..46e254e6f 100644
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-models
-    project-name: 'policy-models'
+    project-name: "policy-models"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/models'
+    project: "policy/models"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-models-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-models-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/models'
-    project-name: 'policy-models'
-    branch: 'master'
-    mvn-settings: 'policy-models-settings'
+    project: "policy/models"
+    project-name: "policy-models"
+    branch: "master"
+    mvn-settings: "policy-models-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-models-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/models
-    project-name: 'policy-models'
+    project-name: "policy-models"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-models-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-models-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 458619ad5..635f6bc07 100644
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-pap
-    project-name: 'policy-pap'
+    project-name: "policy-pap"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/pap'
+    project: "policy/pap"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-pap-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-pap-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/pap'
-    project-name: 'policy-pap'
-    branch: 'master'
-    mvn-settings: 'policy-pap-settings'
+    project: "policy/pap"
+    project-name: "policy-pap"
+    branch: "master"
+    mvn-settings: "policy-pap-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-pap-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/pap
-    project-name: 'policy-pap'
+    project-name: "policy-pap"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-pap-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-pap-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 0ca036baa..ffd94856b 100644
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -1,48 +1,48 @@
 ---
 - project:
     name: policy-parent
-    project-name: 'policy-parent'
+    project-name: "policy-parent"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-Dmaven.test.skip=true"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/parent'
+    project: "policy/parent"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-parent-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-parent-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
     name: policy-parent-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/parent
-    project-name: 'policy-parent'
+    project-name: "policy-parent"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-parent-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-parent-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index cce8a3bd9..a0a940d99 100644
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -1,45 +1,45 @@
 ---
 - project:
     name: policy-xacml-pdp
-    project-name: 'policy-xacml-pdp'
+    project-name: "policy-xacml-pdp"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java':
-          docker-pom: 'pom.xml'
-          mvn-params: '-P docker'
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java":
+          docker-pom: "pom.xml"
+          mvn-params: "-P docker"
           build-node: ubuntu1804-docker-8c-8g
       - gerrit-maven-stage:
           sbom-generator: true
           sign-artifacts: true
           build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
-          mvn-params: '-Dmaven.test.skip=true'
+          mvn-params: "-Dmaven.test.skip=true"
       - gerrit-maven-docker-stage:
           sbom-generator: true
           build-node: ubuntu1804-docker-8c-8g
           maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
           build-node: centos7-docker-2c-1g
 
-    project: 'policy/xacml-pdp'
+    project: "policy/xacml-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'jakarta':
-          branch: 'jakarta'
-      - 'kohn':
-          branch: 'kohn'
-    mvn-settings: 'policy-xacml-pdp-settings'
+      - "master":
+          branch: "master"
+      - "honolulu":
+          branch: "honolulu"
+      - "istanbul":
+          branch: "istanbul"
+      - "jakarta":
+          branch: "jakarta"
+      - "kohn":
+          branch: "kohn"
+    mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
+    files: "**"
+    archive-artifacts: ""
     build-node: ubuntu1804-builder-4c-4g
 
 - project:
@@ -47,30 +47,30 @@
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'policy/xacml-pdp'
-    project-name: 'policy-xacml-pdp'
-    branch: 'master'
-    mvn-settings: 'policy-xacml-pdp-settings'
+    project: "policy/xacml-pdp"
+    project-name: "policy-xacml-pdp"
+    branch: "master"
+    mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk11
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
     name: policy-xacml-pdp-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: policy/xacml-pdp
-    project-name: 'policy-xacml-pdp'
+    project-name: "policy-xacml-pdp"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'policy-xacml-pdp-settings'
+      - "master":
+          branch: "master"
+    mvn-settings: "policy-xacml-pdp-settings"
     java-version: openjdk11
 
 - project:
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index e8a145b67..b5b11ed6a 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -1,66 +1,66 @@
 ---
 - project:
-      name: so-libs
-      project-name: "so-libs"
-      jobs:
-          - "{project-name}-{stream}-verify-java"
-          - "{project-name}-{stream}-merge-java"
-          - gerrit-maven-stage:
-                sbom-generator: true
-                sign-artifacts: true
-                build-node: centos8-docker-4c-4g
-                maven-versions-plugin: true
-          - "{project-name}-gerrit-release-jobs":
-                build-node: centos7-docker-2c-1g
-      project: "so/libs"
-      stream:
-          - "master":
-                branch: "master"
-                java-version: openjdk11
-      mvn-settings: "so-libs-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: ""
+    name: so-libs
+    project-name: "so-libs"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "so/libs"
+    stream:
+      - "master":
+          branch: "master"
+          java-version: openjdk11
+    mvn-settings: "so-libs-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: ""
 
 - project:
-      name: so-libs-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-builder-4c-4g
-      project: "so/libs"
-      project-name: "so-libs"
-      branch: "master"
-      mvn-settings: "so-libs-settings"
-      mvn-goals: "clean install"
-      mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    name: so-libs-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-builder-4c-4g
+    project: "so/libs"
+    project-name: "so-libs"
+    branch: "master"
+    mvn-settings: "so-libs-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
 
 - project:
-      name: so-libs-clm
-      java-version: openjdk11
-      jobs:
-          - gerrit-maven-clm
-      nexus-iq-namespace: "onap-"
-      project: so/libs
-      project-name: "so-libs"
-      branch: "master"
-      mvn-settings: "so-libs-settings"
+    name: so-libs-clm
+    java-version: openjdk11
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: so/libs
+    project-name: "so-libs"
+    branch: "master"
+    mvn-settings: "so-libs-settings"
 
 - project:
-      name: so-libs-info
-      project-name: so-libs
-      java-version: openjdk11
-      jobs:
-          - gerrit-info-yaml-verify
-      build-node: centos8-builder-2c-1g
-      project: so/libs
-      branch: master
+    name: so-libs-info
+    project-name: so-libs
+    java-version: openjdk11
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos8-builder-2c-1g
+    project: so/libs
+    branch: master