Refactor: Cleanup for pre-commit

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

8 files changed, 525 insertions, 535 deletions

diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml
index c5f8853bf..b35c0f331 100644
--- a/jjb/global-defaults.yaml
+++ b/jjb/global-defaults.yaml
@@ -21,40 +21,39 @@
     packer-version: 1.3.1
 
     # default gerrit server definition
-    server-name: 'Primary'
-    gerrit-server-name: 'Primary'
+    server-name: "Primary"
+    gerrit-server-name: "Primary"
 
     # Java
-    jdk: ''
+    jdk: ""
 
     # Maven
-    mvn-params: ''
-    mvn-staging-id: 'ecomp-staging'
+    mvn-params: ""
+    mvn-staging-id: "ecomp-staging"
     onap-infra-mvn-opts: |
-        --show-version
-        --batch-mode
-        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
-        -Djenkins
-        -Dmaven.repo.local=/tmp/r
-        -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
+      --show-version
+      --batch-mode
+      -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      -Djenkins
+      -Dmaven.repo.local=/tmp/r
+      -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
     staging-profile-id: 176c31dfe190a
-
     # Timeout in minutes
     build-timeout: 90
     build-node: ubuntu1804-builder-4c-4g
 
-    archive-artifacts: ''
+    archive-artifacts: ""
 
     # Set default maven version used for everything
-    maven-version: 'mvn33'
+    maven-version: "mvn33"
 
     # git submodule attributes
     submodule-recursive: true
     submodule-disable: false
 
     # Jenkins
-    jenkins-ssh-credential: 'onap-jenkins-ssh'
-    jenkins-ssh-release-credential: 'jenkins-release'
+    jenkins-ssh-credential: "onap-jenkins-ssh"
+    jenkins-ssh-release-credential: "jenkins-release"
 
     # SonarCloud
     sonarcloud_project_organization: onap
@@ -65,4 +64,4 @@
     container-snapshot-registry: nexus3.onap.org:10003
     container-staging-registry: nexus3.onap.org:10004
     # the quotes here are REQUIRED
-    container-push-registry: '{container-snapshot-registry}'
+    container-push-registry: "{container-snapshot-registry}"
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index bc401070c..8fb7afef5 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -9,10 +9,10 @@
     builders:
       - config-file-provider:
           files:
-            - file-id: '{global-settings-file}'
-              variable: 'GLOBAL_SETTINGS_FILE'
-            - file-id: '{settings-file}'
-              variable: 'SETTINGS_FILE'
+            - file-id: "{global-settings-file}"
+              variable: "GLOBAL_SETTINGS_FILE"
+            - file-id: "{settings-file}"
+              variable: "SETTINGS_FILE"
 
 # call maven-target builder with a goal of --version to force Jenkins to
 # install the needed maven version
@@ -20,33 +20,33 @@
     name: maven-install
     builders:
       - maven-target:
-          maven-version: '{maven-version}'
-          goals: '--version'
+          maven-version: "{maven-version}"
+          goals: "--version"
 
 - builder:
     name: maven-set-release-version
     builders:
       - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'versions:set versions:update-child-modules versions:commit -B'
+          maven-version: "{maven-version}"
+          pom: "{pom}"
+          goals: "versions:set versions:update-child-modules versions:commit -B"
           properties:
-            - 'newVersion=${{release_version}}'
-          settings: '{mvn-settings}'
+            - "newVersion=${{release_version}}"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
 
 - builder:
     name: maven-docker-push-release
     builders:
       - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy -B -P {mvn-profile}'
-          settings: '{mvn-settings}'
+          maven-version: "{maven-version}"
+          pom: "{pom}"
+          goals: "clean deploy -B -P {mvn-profile}"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
           properties:
             - maven.test.skip=true
@@ -57,12 +57,12 @@
     name: maven-docker-push-daily
     builders:
       - maven-target:
-          maven-version: '{maven-version}'
-          pom: '{pom}'
-          goals: 'clean deploy -B -P {mvn-profile} {mvn-params}'
-          settings: '{mvn-settings}'
+          maven-version: "{maven-version}"
+          pom: "{pom}"
+          goals: "clean deploy -B -P {mvn-profile} {mvn-params}"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
           properties:
             - docker.pull.registry=nexus3.onap.org:10001
@@ -78,8 +78,7 @@
     builders:
       - inject:
           properties-content: PYPI_SERVER={pypi-server}
-      - shell:
-          !include-raw-escape: ../shell/pypi-publish.sh
+      - shell: !include-raw-escape: ../shell/pypi-publish.sh
 
 # PARAMETERS
 - parameter:
@@ -87,39 +86,39 @@
     parameters:
       - string:
           name: PROJECT
-          default: '{project}'
+          default: "{project}"
           # yamllint disable rule:line-length
-          description: 'JJB configured PROJECT parameter to identify a Gerrit project'
+          description: "JJB configured PROJECT parameter to identify a Gerrit project"
           # yamllint enable
       - string:
           name: ARCHIVE_ARTIFACTS
-          default: '{artifacts} **/target/surefire-reports/*-output.txt'
+          default: "{artifacts} **/target/surefire-reports/*-output.txt"
           # yamllint disable rule:line-length
-          description: 'Space separated glob patterns for artifacts to archive to logs hosting'
+          description: "Space separated glob patterns for artifacts to archive to logs hosting"
           # yamllint enable
       - string:
           name: GERRIT_BRANCH
-          default: '{branch}'
-          description: 'JJB configured GERRIT_BRANCH parameter'
+          default: "{branch}"
+          description: "JJB configured GERRIT_BRANCH parameter"
       - string:
           name: GERRIT_PROJECT
-          default: '{project}'
-          description: 'GERRIT_PROJECT parameter if not given by trigger'
+          default: "{project}"
+          description: "GERRIT_PROJECT parameter if not given by trigger"
       - string:
           name: GERRIT_REFSPEC
-          default: '{refspec}'
-          description: 'GERRIT_REFSPEC parameter if not given by trigger'
+          default: "{refspec}"
+          description: "GERRIT_REFSPEC parameter if not given by trigger"
       - string:
           name: STACK_NAME
-          default: '$JOB_NAME-$BUILD_NUMBER'
-          description: 'Used by Heat to generate a unique stack & vm name'
+          default: "$JOB_NAME-$BUILD_NUMBER"
+          description: "Used by Heat to generate a unique stack & vm name"
 
 - parameter:
     name: maven-params
     parameters:
       - string:
           name: MAVEN_PARAMS
-          default: '{mvn-params}'
+          default: "{mvn-params}"
           description: Maven parameters to pass to the mvn command.
 
 - parameter:
@@ -128,9 +127,9 @@
       - string:
           name: MVN
           # yamllint disable rule:line-length
-          default: '/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn'
+          default: "/w/tools/hudson.tasks.Maven_MavenInstallation/{maven-version}/bin/mvn"
           # yamllint enable
-          description: 'Maven selector to be used by shell scripts'
+          description: "Maven selector to be used by shell scripts"
 
 - parameter:
     name: docker-image-name
@@ -138,16 +137,16 @@
       - string:
           name: DOCKER_IMAGE_NAME
           # yamllint disable rule:line-length
-          default: '{docker-image-name}'
+          default: "{docker-image-name}"
           # yamllint enable
-          description: 'Docker image name, e.g. onap/appc'
+          description: "Docker image name, e.g. onap/appc"
 
 # PROPERTIES
 - property:
     name: infra-properties
     properties:
       - build-discarder:
-          days-to-keep: '{build-days-to-keep}'
+          days-to-keep: "{build-days-to-keep}"
           num-to-keep: 40
           artifact-days-to-keep: -1
           artifact-num-to-keep: 5
@@ -157,7 +156,7 @@
     name: archive-artifacts
     publishers:
       - archive:
-          artifacts: '{artifacts}'
+          artifacts: "{artifacts}"
           allow-empty: true
           fingerprint: true
           latest-only: true
@@ -166,11 +165,11 @@
     name: email-notification
     publishers:
       - email-ext:
-          recipients: 'nobody@open-o.org'
+          recipients: "nobody@open-o.org"
           reply-to:
           content-type: default
           # yamllint disable rule:line-length
-          subject: '{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!'
+          subject: "{email-prefix} $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS!"
           # yamllint enable
           body: |
             $PROJECT_NAME - Build # $BUILD_NUMBER - $BUILD_STATUS:
@@ -186,11 +185,11 @@
     name: jacoco-report
     publishers:
       - jacoco:
-          exec-pattern: '**/**.exec'
-          class-pattern: '**/classes'
-          source-pattern: '**/src/main/java'
+          exec-pattern: "**/**.exec"
+          class-pattern: "**/classes"
+          source-pattern: "**/src/main/java"
           # yamllint disable rule:line-length
-          exclusion-pattern: '**/gen**,**/generated-sources/**,**/yang-gen**,**/pax/**'
+          exclusion-pattern: "**/gen**,**/generated-sources/**,**/yang-gen**,**/pax/**"
           # yamllint enable
           status-update: true
           targets:
@@ -205,10 +204,10 @@
     name: checkstyle-result
     publishers:
       - checkstyle:
-          pattern: '**/checkstyle-result.xml'
+          pattern: "**/checkstyle-result.xml"
           healthy: 0
           unhealthy: 100
-          health-threshold: 'high'
+          health-threshold: "high"
           thresholds:
             unstable:
               total-all: 30
@@ -224,10 +223,10 @@
     name: checkstyle-result-daily
     publishers:
       - checkstyle:
-          pattern: '**/checkstyle-result.xml'
+          pattern: "**/checkstyle-result.xml"
           healthy: 0
           unhealthy: 100
-          health-threshold: 'high'
+          health-threshold: "high"
           thresholds:
             unstable:
               total-all: 30
@@ -244,11 +243,11 @@
     name: git-scm
     scm:
       - git:
-          credentials-id: 'onap-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: ''
+          credentials-id: "onap-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: ""
           branches:
-            - 'origin/{branch}'
+            - "origin/{branch}"
           skip-tag: true
           wipe-workspace: true
           timeout: 30
@@ -257,40 +256,40 @@
     name: gerrit-trigger-scm
     scm:
       - git:
-          credentials-id: 'onap-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: '{refspec}'
+          credentials-id: "onap-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: "{refspec}"
           branches:
-            - 'origin/$GERRIT_BRANCH'
+            - "origin/$GERRIT_BRANCH"
           skip-tag: true
           timeout: 30
-          choosing-strategy: '{choosing-strategy}'
+          choosing-strategy: "{choosing-strategy}"
           submodule:
-            recursive: '{submodule-recursive}'
+            recursive: "{submodule-recursive}"
 
 - scm:
     name: gerrit-trigger-scm-basedir
     scm:
       - git:
-          credentials-id: 'onap-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: '{refspec}'
+          credentials-id: "onap-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: "{refspec}"
           branches:
-            - 'origin/$GERRIT_BRANCH'
+            - "origin/$GERRIT_BRANCH"
           skip-tag: true
           timeout: 30
-          choosing-strategy: '{choosing-strategy}'
-          basedir: '{basedir}'
+          choosing-strategy: "{choosing-strategy}"
+          basedir: "{basedir}"
 
 - scm:
     name: git-branch-scm
     scm:
       - git:
-          credentials-id: 'onap-jenkins-ssh'
-          url: '$GIT_BASE'
-          refspec: ''
+          credentials-id: "onap-jenkins-ssh"
+          url: "$GIT_BASE"
+          refspec: ""
           branches:
-            - 'origin/{branch}'
+            - "origin/{branch}"
           skip-tag: true
           timeout: 30
           wipe-workspace: true
@@ -299,15 +298,15 @@
     name: git-extra-project
     scm:
       - git:
-          credentials-id: 'onap-jenkins-ssh'
-          url: '$GIT_NO_PROJECT/{project}'
-          refspec: '{refspec}'
+          credentials-id: "onap-jenkins-ssh"
+          url: "$GIT_NO_PROJECT/{project}"
+          refspec: "{refspec}"
           branches:
-            - 'origin/{branch}'
+            - "origin/{branch}"
           skip-tag: true
           timeoute: 30
           wipe-workspace: false
-          basedir: '{checkout-dir}'
+          basedir: "{checkout-dir}"
 
 # TRIGGERS
 
@@ -324,112 +323,111 @@
     name: gerrit-trigger-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: "{server}"
           trigger-on:
             - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
+                exclude-drafts: "false"
+                exclude-trivial-rebase: "false"
+                exclude-no-code-change: "false"
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: 'recheck'
+                comment-contains-value: "recheck"
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: 'ANT'
-                  pattern: '{files}'
+                - compare-type: "ANT"
+                  pattern: "{files}"
 
 - trigger:
     name: gerrit-trigger-patch-merged
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: "{server}"
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
-                comment-contains-value: 'remerge'
+                comment-contains-value: "remerge"
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: 'ANT'
-                  pattern: '{files}'
+                - compare-type: "ANT"
+                  pattern: "{files}"
 
 - trigger:
     name: gerrit-trigger-helm-patch-submitted
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: "{server}"
           trigger-on:
             - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-no-code-change: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-wip: 'true'
+                exclude-drafts: "false"
+                exclude-no-code-change: "false"
+                exclude-trivial-rebase: "false"
+                exclude-wip: "true"
             - draft-published-event
             - comment-added-contains-event:
                 comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$'
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: 'ANT'
-                  pattern: '{files}'
+                - compare-type: "ANT"
+                  pattern: "{files}"
 
 - trigger:
     name: gerrit-trigger-helm-patch-merged
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: "{server}"
           trigger-on:
             - change-merged-event
             - comment-added-contains-event:
-                comment-contains-value: '^remerge-helm$'
+                comment-contains-value: "^remerge-helm$"
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: 'ANT'
-                  pattern: '{files}'
+                - compare-type: "ANT"
+                  pattern: "{files}"
 
 - trigger:
     name: gerrit-trigger-release-manually
     triggers:
       - gerrit:
-          server-name: '{server}'
+          server-name: "{server}"
           trigger-on:
             - comment-added-contains-event:
-                comment-contains-value: 'please release'
+                comment-contains-value: "please release"
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: 'ANT'
-                  pattern: '**'
+                - compare-type: "ANT"
+                  pattern: "**"
 
 - trigger:
     name: trigger-on-build-success
     triggers:
       - reverse:
-          jobs: '{job-name}'
-          result: 'success'
-
+          jobs: "{job-name}"
+          result: "success"
 
 # WRAPPERS
 - wrapper:
@@ -484,12 +482,12 @@
       - timestamps
       - timeout:
           type: absolute
-          timeout: '{build-timeout}'
-          timeout-var: 'BUILD_TIMEOUT'
+          timeout: "{build-timeout}"
+          timeout-var: "BUILD_TIMEOUT"
           fail: true
       - ssh-agent-credentials:
           users:
-            - 'onap-jenkins-ssh'
+            - "onap-jenkins-ssh"
       - openstack:
           single-use: true
 
@@ -501,11 +499,11 @@
       - timestamps
       - timeout:
           type: absolute
-          timeout: '{build-timeout}'
-          timeout-var: 'BUILD_TIMEOUT'
+          timeout: "{build-timeout}"
+          timeout-var: "BUILD_TIMEOUT"
           fail: true
       - ssh-agent-credentials:
           users:
-            - 'onap-jenkins-ssh'
+            - "onap-jenkins-ssh"
       - openstack:
           single-use: false
diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
index ac841a5af..7e25869b4 100644
--- a/jjb/global-templates-c.yaml
+++ b/jjb/global-templates-c.yaml
@@ -20,34 +20,34 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     disabled: false
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          stream: '{stream}'
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-disable: '{submodule-disable}'
-          submodule-timeout: '{submodule-timeout}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "$GIT_URL/$PROJECT"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-disable: "{submodule-disable}"
+          submodule-timeout: "{submodule-timeout}"
           choosing-strategy: default
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     publishers:
       - lf-infra-publish
@@ -59,20 +59,20 @@
     # Required Variables:
     #   script:         build script to execute
     #
-    name: '{project-name}-{stream}-verify-c'
+    name: "{project-name}-{stream}-verify-c"
     id: gerrit-verify-c
     <<: *c_job_common
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
 
     builders:
       - lf-infra-pre-build
-      - shell: '{script}'
+      - shell: "{script}"
 
 - job-template:
     # Job template for building & pushing docker images
@@ -81,23 +81,23 @@
     #  1. login to the docker registry
     #  2. run a specified shell builder
     #
-    name: '{project-name}-{stream}-docker-c-shell-daily'
+    name: "{project-name}-{stream}-docker-c-shell-daily"
     id: gerrit-docker-c-shell-daily
     <<: *c_job_common
-    node: 'ubuntu1804-docker-8c-8g'
+    node: "ubuntu1804-docker-8c-8g"
 
     triggers:
       # 12 AM UTC
-      - timed: '@daily'
+      - timed: "@daily"
       - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - docker-login
-      - shell: '{script}'
+      - shell: "{script}"
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
index 5380bde1c..a58467468 100644
--- a/jjb/global-templates-docker.yaml
+++ b/jjb/global-templates-docker.yaml
@@ -6,7 +6,7 @@
     name: docker_job_boiler_plate
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
 
     ######################
     # Default parameters #
@@ -16,14 +16,14 @@
     submodule-recursive: true
 
     # default params for docker jobs
-    pre_build_script: ''
-    post_build_script: ''
-    docker_root: '$WORKSPACE'
-    docker_build_args: ''
-    docker_name: 'unnamed'
+    pre_build_script: ""
+    post_build_script: ""
+    docker_root: "$WORKSPACE"
+    docker_build_args: ""
+    docker_name: "unnamed"
     # Default to LF standard 'snapshots' docker registry
-    docker_registry: '$DOCKER_REGISTRY:10003'
-    docker_tag: 'latest'
+    docker_registry: "$DOCKER_REGISTRY:10003"
+    docker_tag: "latest"
     submodule-disable: false
     submodule-timeout: 10
 
@@ -33,19 +33,19 @@
 
     properties:
       - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - lf-infra-parameters:
-          branch: '{branch}'
-          project: '{project}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
+          branch: "{branch}"
+          project: "{project}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     publishers:
       - lf-infra-publish
@@ -57,41 +57,41 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          status-context: '{project}-Docker-Verify'
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{files}'
+          status-context: "{project}-Docker-Verify"
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{files}"
 
 - _docker_merge_boiler_plate: &docker_merge_boiler_plate
     name: docker_merge_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{files}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{files}"
       - pollscm:
-          cron: ''
+          cron: ""
 
 #################
 # JOB TEMPLATES #
 #################
 - job-template:
-    name: '{project-name}-{stream}-merge-docker'
+    name: "{project-name}-{stream}-merge-docker"
     # Job template for Docker merge jobs
     #
     # The purpose of this job template is to run a docker build, and potentially
@@ -104,9 +104,9 @@
     builders:
       - lf-infra-pre-build
       - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+      - shell: "{pre_build_script}"
       - inject:
           # Docker registry is purposely not using an '_' so as to not conflict
           # with the Jenkins global env var
@@ -121,14 +121,14 @@
       - shell: !include-raw: ../shell/docker-build.sh
       - inject:
           # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
+          properties-file: "env_inject.txt"
       # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
+      - shell: "{post_build_script}"
       # Provided all steps have already passed, push the docker image
       - shell: !include-raw: ../shell/docker-push.sh
 
 - job-template:
-    name: '{project-name}-{stream}-verify-docker'
+    name: "{project-name}-{stream}-verify-docker"
     # Job template for Docker verify jobs
     #
     # The purpose of this job template is to run a docker build, and potentially
@@ -145,9 +145,9 @@
     builders:
       - lf-infra-pre-build
       - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
-      - shell: '{pre_build_script}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
+      - shell: "{pre_build_script}"
       - inject:
           # Docker registry is purposely not using an '_' so as to not conflict
           # with the Jenkins global env var
@@ -162,9 +162,9 @@
       - shell: !include-raw: ../shell/docker-build.sh
       - inject:
           # Import the docker image information from the build step
-          properties-file: 'env_inject.txt'
+          properties-file: "env_inject.txt"
       # Execute any post build clean-up or testing
-      - shell: '{post_build_script}'
+      - shell: "{post_build_script}"
 
 - job-template:
     # Job template for creating a docker manifest list
@@ -173,38 +173,37 @@
     # 1. docker_push_manifest.sh script (which needs to exist in the
     #    project implementation repo)
 
-    name: '{project-name}-docker-manifest-{stream}'
+    name: "{project-name}-docker-manifest-{stream}"
     <<: *docker_job_boiler_plate
-    node: '{build-node}'
+    node: "{build-node}"
     build-timeout: 15
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - string:
           name: PARENT_JOB_NAME
-          default: 'none'
+          default: "none"
 
-    disabled: '{obj:disabled}'
+    disabled: "{obj:disabled}"
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "$GIT_URL/$PROJECT"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
           submodule-recursive: true
-          submodule-disable: '{submodule-disable}'
-          submodule-timeout: '{submodule-timeout}'
+          submodule-disable: "{submodule-disable}"
+          submodule-timeout: "{submodule-timeout}"
           choosing-strategy: default
 
-
     builders:
       - lf-infra-docker-login:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - shell: |
           #!/bin/bash -ex
           export PARENT_JOB_NAME
@@ -218,84 +217,82 @@
     # 2. Build and push a docker manifest list for the images created by
     #    the previous jobs
 
-    name: '{project-name}-multiarch-docker-stage-{stream}'
-    node: '{build-node}'
+    name: "{project-name}-multiarch-docker-stage-{stream}"
+    node: "{build-node}"
     project-type: multijob
-    disabled: '{obj:disabled}'
+    disabled: "{obj:disabled}"
     build-timeout: 15
-    pattern: '**'
+    pattern: "**"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - string:
           name: DOCKER_REGISTRY
-          default: 'none'
+          default: "none"
       - string:
           name: DOCKERHUB_REGISTRY
-          default: 'registry-1.docker.io'
-
-    disabled: '{obj:disabled}'
+          default: "registry-1.docker.io"
 
     properties:
       - throttle:
           max-per-node: 1
-          option: 'project'
+          option: "project"
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '{project-name}-.*-docker-.*'
-          blocking-level: 'NODE'
+            - "{project-name}-.*-docker-.*"
+          blocking-level: "NODE"
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          git-url: '$GIT_URL/$PROJECT'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          git-url: "$GIT_URL/$PROJECT"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
           submodule-recursive: true
           submodule-timeout: 10
           submodule-disable: false
           choosing-strategy: default
 
     triggers:
-      - timed: '@daily'
+      - timed: "@daily"
       - gerrit:
-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"
           trigger-on:
-             - comment-added-contains-event:
-                 comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
+            - comment-added-contains-event:
+              comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
 
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"
               file-paths:
-                 - compare-type: ANT
-                   pattern: "**"
+                - compare-type: ANT
+                  pattern: "**"
 
     builders:
       - multijob:
-          name: 'build docker images'
+          name: "build docker images"
           condition: ALWAYS
           execution-type: PARALLEL
           projects:
-            - name: '{project-name}-amd64-maven-docker-stage-{stream}'
+            - name: "{project-name}-amd64-maven-docker-stage-{stream}"
               kill-phase-on: FAILURE
               current-parameters: true
-            - name: '{project-name}-arm64-maven-docker-stage-{stream}'
+            - name: "{project-name}-arm64-maven-docker-stage-{stream}"
               kill-phase-on: NEVER
               current-parameters: true
       - multijob:
-          name: 'publish docker manifest'
+          name: "publish docker manifest"
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: '{project-name}-docker-manifest-{stream}'
+            - name: "{project-name}-docker-manifest-{stream}"
               current-parameters: true
               predefined-parameters: |
                 PARENT_JOB_NAME=$JOB_NAME
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 72004dc8d..96435034f 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -17,55 +17,55 @@
     #     pattern:   ant file-path pattern relative to the workspace used to
     #                trigger the job
 
-    name: '{project-name}-{stream}-verify-golang'
-    path: '$WORKSPACE'
-    pattern: '**'
-    script: ''
-    golangver: 'golang110'
+    name: "{project-name}-{stream}-verify-golang"
+    path: "$WORKSPACE"
+    pattern: "**"
+    script: ""
+    golangver: "golang110"
 
     project-type: freestyle
     concurrent: true
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
 
     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:
-      - '{golangver}'
+      - "{golangver}"
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - shell: |
           #!/bin/bash
           cd $WORKSPACE/{path}
           make build
-      - shell: '{script}'
+      - shell: "{script}"
 
     publishers:
       - lf-infra-publish
@@ -74,7 +74,7 @@
     # Job template for Golang verify jobs with subproject support
 
     <<: *verify_golang_bolierplate
-    name: '{project-name}-{stream}-{subproject}-verify-golang'
+    name: "{project-name}-{stream}-{subproject}-verify-golang"
 
 - job-template:
     # Job template for Golang merge jobs
@@ -89,49 +89,49 @@
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
-    name: '{project-name}-{stream}-merge-golang'
+    name: "{project-name}-{stream}-merge-golang"
     path: $WORKSPACE
-    golangver: 'golang110'
+    golangver: "golang110"
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
-      - '{golangver}'
+      - "{golangver}"
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - shell: |
           #!/bin/bash
           cd $WORKSPACE/{path}
@@ -152,49 +152,49 @@
     #  2. run a specified shell builder
     #
 
-    name: '{project-name}-{stream}-docker-golang-shell-daily'
-    golangver: 'golang110'
+    name: "{project-name}-{stream}-docker-golang-shell-daily"
+    golangver: "golang110"
     project-type: freestyle
-    node: 'ubuntu1804-docker-8c-8g'
+    node: "ubuntu1804-docker-8c-8g"
     disabled: false
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
-      - '{golangver}'
+      - "{golangver}"
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       # 12 AM UTC
-      - timed: '@daily'
+      - timed: "@daily"
       - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
 
       - docker-login
 
-      - shell: '{script}'
+      - shell: "{script}"
 
     publishers:
       - lf-infra-publish
diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml
index 98a67b816..ccf19b507 100644
--- a/jjb/global-templates-helm.yaml
+++ b/jjb/global-templates-helm.yaml
@@ -28,10 +28,10 @@
     ######################
     branch: master
     # default params for helm jobs
-    build_script: ''
-    git-url: '$GIT_URL/$PROJECT'
-    post_build_script: ''
-    pre_build_script: ''
+    build_script: ""
+    git-url: "$GIT_URL/$PROJECT"
+    post_build_script: ""
+    pre_build_script: ""
     build-timeout: 240
 
     #####################
@@ -39,40 +39,40 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - lf-infra-parameters:
-          branch: '{branch}'
-          project: '{project}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
+          branch: "{branch}"
+          project: "{project}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"
       - string:
           name: HELM_BIN
-          default: '{helm_bin|helm3.8}'
+          default: "{helm_bin|helm3.8}"
       - string:
           name: BUILD_TYPE
-          default: '{build_type|snapshot}'
+          default: "{build_type|snapshot}"
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     builders:
       - lf-infra-pre-build
       - lf-provide-maven-settings:
-          global-settings-file: '{mvn-global-settings}'
-          settings-file: '{mvn-settings}'
-      - shell: '{obj:pre_build_script}'
-      - shell: '{obj:build_script}'
+          global-settings-file: "{mvn-global-settings}"
+          settings-file: "{mvn-settings}"
+      - shell: "{obj:pre_build_script}"
+      - shell: "{obj:build_script}"
       - oom-create-netrc:
           server-id: oom-helm
-      - shell: '{obj:post_build_script}'
+      - shell: "{obj:post_build_script}"
       - lf-provide-maven-settings-cleanup
 
     publishers:
@@ -82,7 +82,7 @@
 # JOB TEMPLATES #
 #################
 - job-template:
-    name: '{project-name}-{stream}-verify-{helm_bin}'
+    name: "{project-name}-{stream}-verify-{helm_bin}"
     # Job template for helm verify jobs
 
     <<: *helm_job_boiler_plate
@@ -90,94 +90,94 @@
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     triggers:
       - gerrit-trigger-helm-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{files}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{files}"
 
 - job-template:
-    name: '{project-name}-{stream}-merge-helm'
+    name: "{project-name}-{stream}-merge-helm"
     # Job template for Helm merge jobs
 
     <<: *helm_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     triggers:
       - gerrit-trigger-helm-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{files}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{files}"
 
 - job-template:
-    name: '{project-name}-{stream}-release-helm'
+    name: "{project-name}-{stream}-release-helm"
     # Job template for Helm stage jobs
 
     <<: *helm_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: '^Patch Set\s+\d+:\s+release-helm\s*$'
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: 'ANT'
-                  pattern: '**'
+                - compare-type: "ANT"
+                  pattern: "**"
 
 - job-template:
-    name: '{project-name}-{stream}-verify-make-{helm_bin}'
+    name: "{project-name}-{stream}-verify-make-{helm_bin}"
 
     <<: *helm_job_boiler_plate
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"
           trigger-on:
             - comment-added-contains-event:
                 comment-contains-value: '^Patch Set\s+\d+:\s+helm-latest\s*$'
           projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
               branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
               file-paths:
-                - compare-type: 'ANT'
-                  pattern: '**'
+                - compare-type: "ANT"
+                  pattern: "**"
 
     builders:
       - lf-infra-pre-build
       - helm-install:
           helm_ver: 3.10.2
-      - shell: '{obj:pre_build_script}'
-      - shell: '{obj:build_script}'
+      - shell: "{obj:pre_build_script}"
+      - shell: "{obj:build_script}"
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 79577e481..a2db6dad8 100644
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -15,48 +15,48 @@
     #     pattern:   ant file-path pattern relative to the workspace used to
     #                trigger the job
 
-    name: '{project-name}-{stream}-{subproject}-verify-python'
-    path: '$WORKSPACE'
+    name: "{project-name}-{stream}-{subproject}-verify-python"
+    path: "$WORKSPACE"
 
     project-type: freestyle
     concurrent: true
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - shell: |
           #!/bin/bash
           # shellcheck disable=SC1090
@@ -98,53 +98,53 @@
     # Required Variables:
     #     branch:    git branch (eg. stable/lithium or master)
 
-    name: '{project-name}-{stream}-3scm-docker-shell-daily'
+    name: "{project-name}-{stream}-3scm-docker-shell-daily"
     project-type: freestyle
-    node: 'queue-docker-4c-4g'
+    node: "queue-docker-4c-4g"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
 
     wrappers:
       - infra-wrappers-docker-build:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
-      - timed: 'H */4 * * *'
+      - timed: "H */4 * * *"
       - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
       - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - inject:
           properties-file: version.properties
       - docker-login
-      - shell: '{script}'
+      - shell: "{script}"
 
     publishers:
       - lf-infra-publish
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 3dbe82d74..31db6d582 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -1,6 +1,4 @@
 ---
-# vim: sw=2 ts=2 sts=2 et :
-
 - job-template:
     #
     # job template for verifying gerrit changeset by shell script
@@ -15,41 +13,41 @@
     # Optional Variables:
     #   pattern:          trigger job only if modification covered file in pattern
     #   build-node:     label(flavor) of jenkins slave
-    name: '{project-name}-{stream}-{area}-verify-shell'
-    node: '{build-node}'
+    name: "{project-name}-{stream}-{area}-verify-shell"
+    node: "{build-node}"
     type: freestyle
     concurrent: true
     disable-job: false
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
-    pattern: '**'
+    pattern: "**"
 
     parameters:
       - lf-infra-parameters:
-          branch: '{branch}'
-          project: '{project}'
-          stream: '{stream}'
-          lftools-version: '{lftools-version}'
+          branch: "{branch}"
+          project: "{project}"
+          stream: "{stream}"
+          lftools-version: "{lftools-version}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          submodule-recursive: '{submodule-recursive}'
-          choosing-strategy: 'gerrit'
+          refspec: "$GERRIT_REFSPEC"
+          submodule-recursive: "{submodule-recursive}"
+          choosing-strategy: "gerrit"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{pattern}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "{pattern}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     builders:
-      - shell: '{script}'
+      - shell: "{script}"
 
     publishers:
       - lf-infra-publish
@@ -69,67 +67,65 @@
     #                     $WORKSPACE as it will destroy the initial
     #                     project checkout
 
-    name: '{project-name}-{stream}-two-scm-verify-script'
+    name: "{project-name}-{stream}-two-scm-verify-script"
 
     project-type: freestyle
     concurrent: true
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$GERRIT_REFSPEC'
-          choosing-strategy: 'gerrit'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: "$GERRIT_REFSPEC"
+          choosing-strategy: "gerrit"
+          submodule-recursive: "{submodule-recursive}"
       - git-extra-project:
-          project: '{extra-project}'
-          refspec: '{extra-refspec}'
-          branch: '{extra-branch}'
-          checkout-dir: '{checkout-dir}'
+          project: "{extra-project}"
+          refspec: "{extra-refspec}"
+          branch: "{extra-branch}"
+          checkout-dir: "{checkout-dir}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: '{maven-version}'
-          goals: '--version'
-          settings: '{mvn-settings}'
+          maven-version: "{maven-version}"
+          goals: "--version"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
-      - shell: '{script}'
+      - shell: "{script}"
 
     publishers:
       - lf-infra-publish
 
-# vim: sw=2 ts=2 sts=2 et :
-
 - job-template:
     # Job template for two scm and script trigger - for docker merge
     #
@@ -138,62 +134,62 @@
     #   build-node:     what build node to run on
     #   script:         build script to execute
 
-    name: '{project-name}-{stream}-two-scm-merge-docker-script'
+    name: "{project-name}-{stream}-two-scm-merge-docker-script"
 
     project-type: freestyle
     concurrent: true
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
       - git-extra-project:
-          project: '{extra-project}'
-          refspec: '{extra-refspec}'
-          branch: '{extra-branch}'
-          checkout-dir: '{checkout-dir}'
+          project: "{extra-project}"
+          refspec: "{extra-refspec}"
+          branch: "{extra-branch}"
+          checkout-dir: "{checkout-dir}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-patch-merged:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '**'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
+          files: "**"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - docker-login
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: '{maven-version}'
-          goals: '--version'
-          settings: '{mvn-settings}'
+          maven-version: "{maven-version}"
+          goals: "--version"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
-      - shell: '{script}'
+      - shell: "{script}"
 
     publishers:
       - lf-infra-publish
@@ -206,61 +202,61 @@
     #   build-node:     what build node to run on
     #   script:         build script to execute
 
-    name: '{project-name}-{stream}-two-scm-release-docker-script-manual'
+    name: "{project-name}-{stream}-two-scm-release-docker-script-manual"
 
     project-type: freestyle
     concurrent: true
-    node: '{build-node}'
+    node: "{build-node}"
 
     properties:
       - infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
+          project: "{project}"
+          branch: "{branch}"
+          refspec: "refs/heads/{branch}"
+          artifacts: "{archive-artifacts}"
       - maven-exec:
-          maven-version: '{maven-version}'
+          maven-version: "{maven-version}"
 
     scm:
       - gerrit-trigger-scm:
-          refspec: ''
-          choosing-strategy: 'default'
-          submodule-recursive: '{submodule-recursive}'
+          refspec: ""
+          choosing-strategy: "default"
+          submodule-recursive: "{submodule-recursive}"
       - git-extra-project:
-          project: '{extra-project}'
-          refspec: '{extra-refspec}'
-          branch: '{extra-branch}'
-          checkout-dir: '{checkout-dir}'
+          project: "{extra-project}"
+          refspec: "{extra-refspec}"
+          branch: "{extra-branch}"
+          checkout-dir: "{checkout-dir}"
 
     wrappers:
       - infra-wrappers:
-          build-timeout: '{build-timeout}'
+          build-timeout: "{build-timeout}"
 
     triggers:
       - gerrit-trigger-release-manually:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
+          server: "{server-name}"
+          project: "{project}"
+          branch: "{branch}"
 
     builders:
       - lf-infra-pre-build
       - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: '{mvn-settings}'
+          global-settings-file: "global-settings"
+          settings-file: "{mvn-settings}"
       - docker-login
       # make sure maven gets installed / setup
       - maven-target:
-          maven-version: '{maven-version}'
-          goals: '--version'
-          settings: '{mvn-settings}'
+          maven-version: "{maven-version}"
+          goals: "--version"
+          settings: "{mvn-settings}"
           settings-type: cfp
-          global-settings: 'global-settings'
+          global-settings: "global-settings"
           global-settings-type: cfp
-      - shell: '{script}'
+      - shell: "{script}"
 
     publishers:
       - lf-infra-publish