Refactor: Cleanup for pre-commit

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

1 files changed, 131 insertions, 133 deletions

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