Refactor: Cleanup for pre-commit
Change-Id: If76d59b60149b02b73529138e4c8129349d90180
Issue-ID: CIMAN-33
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 3dbe82d..31db6d5 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