X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=1633c61a0833d686b231e35fd2bbb00634252195;hb=e50da79e348b4302edf4f2cc2ed4842830f9cc54;hp=85a44f83d94d4948ca124a0c50fecfdcfc89581f;hpb=67d9026da328bf16bfa9c1ab0fe88dc25cd1fafa;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 85a44f83..1633c61a 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -1,5 +1,4 @@
 ---
-
 ####################
 # COMMON FUNCTIONS #
 ####################
@@ -10,16 +9,7 @@
       - config-file-provider:
           files:
             - file-id: jjbini
-              target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini'
-
-- builder:
-    name: lf-infra-jjbini-sandbox
-    # TODO: Consolidate this into jjbini when JJB2.0 is available.
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: jjbini-sandbox
-              target: '$HOME/.config/jenkins_jobs/jenkins_jobs.ini'
+              target: "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
 - lf_packer: &lf_packer_common
     name: lf-packer-common
@@ -31,40 +21,41 @@
 
     branch: master
     build-timeout: 90
-    cron: '@monthly'
+    cron: "@monthly"
     disable-job: false
-    github-url: 'https://github.com'
+    github-url: "https://github.com"
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
+    submodule-disable: false
     packer-cloud-settings: packer-cloud-env
-    packer-version: 1.2.5
+    packer-version: 1.4.3
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 7
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - lf-packer-parameters:
-          packer-version: '{packer-version}'
+          packer-version: "{packer-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
@@ -74,11 +65,11 @@
     parameters:
       - string:
           name: JJB_VERSION
-          default: '{jjb-version}'
+          default: "{jjb-version}"
           description: Jenkins Job Builder version to download and install.
       - string:
           name: XDG_CACHE_HOME
-          default: '{jjb-cache}'
+          default: "{jjb-cache}"
           description: Jenkins Job Builder cache location.
 
 - parameter:
@@ -86,9 +77,17 @@
     parameters:
       - string:
           name: PACKER_VERSION
-          default: '{packer-version}'
+          default: "{packer-version}"
           description: Packer version to download and install.
 
+- parameter:
+    name: lf-puppet-parameters
+    parameters:
+      - string:
+          name: PUPPET_LINT_VERSION
+          default: "{puppet-lint-version}"
+          description: Puppet-lint version to download and install.
+
 - lf_jjb_common: &lf_jjb_common
     name: lf-jjb-common
 
@@ -99,53 +98,65 @@
     branch: master
     build-timeout: 10
     disable-job: false
-    github-url: 'https://github.com'
-    jjb-cache: '$HOME/.cache/jenkins_jobs'
+    github-url: "https://github.com"
+    jjb-cache: "$HOME/.cache/jenkins_jobs"
     jjb-version: 2.8.0
     stream: master
     submodule-recursive: true
     submodule-timeout: 10
+    submodule-disable: false
+    throttle_categories: []
+    throttle-enabled: false
+    throttle-max-per-node: 1
+    throttle-max-total: 0
+    throttle-option: "project"
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
-        pattern: 'jjb/.*'
+        pattern: "jjb/.*"
       - compare-type: REG_EXP
-        pattern: 'global-jjb'
+        pattern: "global-jjb"
       - compare-type: REG_EXP
-        pattern: 'shell/.*'
+        pattern: "shell/.*"
 
     # github_included_regions MUST match gerrit_trigger_file_paths
     github_included_regions:
-      - 'jjb/.*'
-      - 'global-jjb'
-      - 'shell/.*'
+      - "jjb/.*"
+      - "global-jjb"
+      - "shell/.*"
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 7
+      - throttle:
+          categories: "{obj:throttle_categories}"
+          enabled: "{throttle-enabled}"
+          max-per-node: "{throttle-max-per-node}"
+          max-total: "{throttle-max-total}"
+          option: "{throttle-option}"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - lf-infra-jjb-parameters:
-          jjb-cache: '{jjb-cache}'
-          jjb-version: '{jjb-version}'
+          jjb-cache: "{jjb-cache}"
+          jjb-version: "{jjb-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
@@ -155,7 +166,7 @@
 ######################
 
 - job-template:
-    name: '{project-name}-gerrit-branch-lock-{stream}'
+    name: "{project-name}-gerrit-branch-lock-{stream}"
     id: gerrit-branch-lock
 
     ######################
@@ -164,9 +175,10 @@
 
     branch: master
     disable-job: false
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
     stream: master
     submodule-timeout: 10
+    submodule-disable: false
     gerrit_merge_triggers:
       - comment-added-contains-event:
           comment-contains-value: (un)?lock branch$
@@ -176,50 +188,50 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
-    disabled: '{disable-job}'
+    node: "{build-node}"
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 1
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
 
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 5
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: ''
-          branch: '{branch}'
+          git-url: "{git-url}"
+          refspec: ""
+          branch: "{branch}"
           submodule-recursive: false
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
+                  branch-pattern: "**/{branch}"
 
     builders:
       - shell: !include-raw-escape: ../shell/gerrit-branch-lock.sh
 
-
     publishers:
       - lf-infra-publish
 
@@ -232,7 +244,7 @@
     builders:
       - lf-infra-jjbini
       - inject:
-          properties-content: 'jenkins_silos={jenkins-silos}'
+          properties-content: "jenkins_silos={jenkins-silos}"
       - shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh
       - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
@@ -241,7 +253,7 @@
     builders:
       - lf-infra-jjbini
       - inject:
-          properties-content: 'jenkins_silos={jenkins-silos}'
+          properties-content: "jenkins_silos={jenkins-silos}"
       - shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
       - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
 
@@ -253,17 +265,18 @@
     ######################
 
     branch: master
-    cron: '@daily'
+    cron: "@daily"
     disable-job: false
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
-    github-url: 'https://github.com'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
+    github-url: "https://github.com"
     jenkins-silos: production sandbox
     submodule-timeout: 10
+    submodule-disable: false
 
     gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
-          comment-contains-value: remerge$
+          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -278,104 +291,106 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     concurrent: false
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 1
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: ''
+          project: "{project}"
+          stream: ""
           branch: master
 
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 10
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     builders:
       - lf-infra-pre-build
       - lf-jenkins-cfg-global-vars:
-          jenkins-silos: '{jenkins-silos}'
+          jenkins-silos: "{jenkins-silos}"
       - lf-jenkins-cfg-clouds:
-          jenkins-silos: '{jenkins-silos}'
+          jenkins-silos: "{jenkins-silos}"
 
     publishers:
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-jenkins-cfg-merge'
+    name: "{project-name}-jenkins-cfg-merge"
     id: gerrit-jenkins-cfg-merge
     <<: *lf_jenkins_cfg_merge
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: 'refs/heads/{branch}'
-          branch: '{branch}'
+          git-url: "{git-url}"
+          refspec: "refs/heads/{branch}"
+          branch: "{branch}"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
 
 - job-template:
-    name: '{project-name}-jenkins-cfg-merge'
+    name: "{project-name}-jenkins-cfg-merge"
     id: github-jenkins-cfg-merge
     <<: *lf_jenkins_cfg_merge
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 1
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: ''
-          branch: 'refs/heads/{branch}'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: ""
+          branch: "refs/heads/{branch}"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
       - github
       - pollscm:
-          cron: ''
+          cron: ""
       - github-pull-request:
-          trigger-phrase: '^remerge$'
+          trigger-phrase: "^remerge$"
           only-trigger-phrase: true
-          status-context: 'Jenkins CFG Merge'
+          status-context: "Jenkins CFG Merge"
           permit-all: true
           github-hooks: true
           org-list:
-            - '{github-org}'
-          white-list: '{obj:github_pr_whitelist}'
-          admin-list: '{obj:github_pr_admin_list}'
-          included-regions: '{obj:github_included_regions}'
+            - "{github-org}"
+          white-list: "{obj:github_pr_whitelist}"
+          admin-list: "{obj:github_pr_admin_list}"
+          included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 ###########################################
 # Jenkins Configuration Management Verify #
@@ -391,10 +406,11 @@
     branch: master
     build-days-to-keep: 7
     disable-job: false
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
-    github-url: 'https://github.com'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
+    github-url: "https://github.com"
     openstack-cloud: vex
     submodule-timeout: 10
+    submodule-disable: false
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -403,7 +419,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -418,35 +434,35 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     concurrent: true
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 1
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: ''
+          project: "{project}"
+          stream: ""
           branch: master
 
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 10
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
       - config-file-provider:
           # Listed after to override openstack-infra-wrappers clouds.yaml
           # definition
           files:
             - file-id: clouds-yaml
-              target: '$HOME/.config/openstack/clouds.yaml'
+              target: "$HOME/.config/openstack/clouds.yaml"
             - file-id: npmrc
-              target: '$HOME/.npmrc'
+              target: "$HOME/.npmrc"
             - file-id: pipconf
-              target: '$HOME/.config/pip/pip.conf'
+              target: "$HOME/.config/pip/pip.conf"
 
     builders:
       - lf-infra-pre-build
@@ -458,61 +474,63 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-jenkins-cfg-verify'
+    name: "{project-name}-jenkins-cfg-verify"
     id: gerrit-jenkins-cfg-verify
     <<: *lf_jenkins_cfg_verify
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: 'refs/heads/{branch}'
-          branch: '{branch}'
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: gerrit
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_verify_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_verify_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
 
 - job-template:
-    name: '{project-name}-jenkins-cfg-verify'
+    name: "{project-name}-jenkins-cfg-verify"
     id: github-jenkins-cfg-verify
     <<: *lf_jenkins_cfg_verify
 
     properties:
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
+          submodule-recursive: true
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^(recheck|reverify)$'
+          trigger-phrase: "^(recheck|reverify)$"
           only-trigger-phrase: false
-          status-context: 'Jenkins CFG Verify'
+          status-context: "Jenkins CFG Verify"
           permit-all: true
           github-hooks: true
-          included-regions: '{obj:github_included_regions}'
+          included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 ###########################
 # JENKINS SANDBOX CLEANUP #
@@ -527,7 +545,7 @@
 
     build-timeout: 30
     # Run every Saturday at 08:00 UTC
-    cron: '0 8 * * 6'
+    cron: "0 8 * * 6"
     disable-job: false
 
     #####################
@@ -535,17 +553,17 @@
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     concurrent: true
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
     parameters:
       - lf-infra-jjb-parameters:
-          jjb-cache: '{jjb-cache}'
-          jjb-version: '{jjb-version}'
+          jjb-cache: "{jjb-cache}"
+          jjb-version: "{jjb-version}"
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
 
     builders:
       - lf-infra-jjbini
@@ -555,20 +573,19 @@
           - ../shell/jjb-cleanup.sh
 
 - job-template:
-    name: '{project-name}-jenkins-sandbox-cleanup'
+    name: "{project-name}-jenkins-sandbox-cleanup"
     id: gerrit-jenkins-sandbox-cleanup
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jenkins_sandbox_cleanup
 
 - job-template:
-    name: '{project-name}-jenkins-sandbox-cleanup'
+    name: "{project-name}-jenkins-sandbox-cleanup"
     id: github-jenkins-sandbox-cleanup
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jenkins_sandbox_cleanup
 
-
 ##################
 # JJB DEPLOY JOB #
 ##################
@@ -584,73 +601,75 @@
     disable-job: false
     # jjb-deploy should always clone $PROJECT regardless of what
     # $GERRIT_PROJECT triggered the job.
-    git-url: '$GIT_URL/$PROJECT'
-    github-url: 'https://github.com'
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
     stream: master
     submodule-timeout: 10
+    submodule-disable: false
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
-          comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+(jjb-deploy[:]* (?!\*+$).+$)'
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     concurrent: true
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 1
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
 
     wrappers:
       - lf-infra-wrappers:
           build-timeout: 5
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     builders:
       - lf-pip-install:
           pip-packages: jenkins-job-builder
-      - lf-infra-jjbini-sandbox
+      - lf-infra-jjbini
       - shell: !include-raw-escape: ../shell/jjb-deploy-job.sh
 
     publishers:
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-jjb-deploy-job'
+    name: "{project-name}-jjb-deploy-job"
     id: gerrit-jjb-deploy-job
     <<: *lf_jjb_deploy_job
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: 'refs/heads/{branch}'
-          branch: '{branch}'
+          git-url: "{git-url}"
+          refspec: "refs/heads/{branch}"
+          branch: "{branch}"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_jjb_deploy_job_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '**'
+              project-pattern: "**"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**'
+                  branch-pattern: "**"
           skip-vote:
             success: true
             failed: true
@@ -658,36 +677,37 @@
             notbuilt: true
 
 - job-template:
-    name: '{project-name}-jjb-deploy-job'
+    name: "{project-name}-jjb-deploy-job"
     id: github-jjb-deploy-job
     <<: *lf_jjb_deploy_job
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 1
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - github-pull-request:
           trigger-phrase: '^jjb-deploy (?!\*+$).+$'
           only-trigger-phrase: true
-          status-context: 'JJB Deploy Job'
+          status-context: "JJB Deploy Job"
           permit-all: true
           github-hooks: true
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 #############
 # JJB Merge #
@@ -700,10 +720,12 @@
     # Default parameters #
     ######################
 
+    jjb-workers: 0
+
     gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
-          comment-contains-value: remerge$
+          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
 
     #####################
     # Job Configuration #
@@ -712,44 +734,47 @@
     builders:
       - lf-infra-pre-build
       - lf-infra-jjbini
+      - inject:
+          properties-content: JJB_WORKERS={jjb-workers}
       - shell: !include-raw-escape:
           - ../shell/jjb-install.sh
           - ../shell/jjb-merge-job.sh
           - ../shell/jjb-cleanup.sh
 
 - job-template:
-    name: '{project-name}-jjb-merge'
+    name: "{project-name}-jjb-merge"
     id: gerrit-jjb-merge
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_merge
 
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: ''
-          branch: '{branch}'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          git-url: "{git-url}"
+          refspec: ""
+          branch: "{branch}"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
 
 - job-template:
-    name: '{project-name}-jjb-merge'
+    name: "{project-name}-jjb-merge"
     id: github-jjb-merge
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
@@ -761,38 +786,39 @@
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 7
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: ''
-          branch: 'refs/heads/{branch}'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: ""
+          branch: "refs/heads/{branch}"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - github
       - pollscm:
-          cron: ''
+          cron: ""
       - github-pull-request:
-          trigger-phrase: '^remerge$'
+          trigger-phrase: "^remerge$"
           only-trigger-phrase: true
-          status-context: 'JJB Merge'
+          status-context: "JJB Merge"
           permit-all: true
           github-hooks: true
           org-list:
-            - '{github-org}'
-          white-list: '{obj:github_pr_whitelist}'
-          admin-list: '{obj:github_pr_admin_list}'
-          included-regions: '{obj:github_included_regions}'
+            - "{github-org}"
+          white-list: "{obj:github_pr_whitelist}"
+          admin-list: "{obj:github_pr_admin_list}"
+          included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 ##############
 # JJB Verify #
@@ -805,6 +831,8 @@
     # Default parameters #
     ######################
 
+    build-concurrent: true
+
     gerrit_verify_triggers:
       - patchset-created-event:
           exclude-drafts: true
@@ -812,13 +840,13 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
     #####################
     # Job Configuration #
     #####################
 
-    concurrent: true
+    concurrent: "{build-concurrent}"
 
     builders:
       - lf-infra-pre-build
@@ -832,7 +860,7 @@
       - lf-infra-gpg-verify-git-signature
 
 - job-template:
-    name: '{project-name}-jjb-verify'
+    name: "{project-name}-jjb-verify"
     id: gerrit-jjb-verify
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
@@ -842,7 +870,7 @@
     # Default parameters #
     ######################
 
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
 
     #####################
     # Job Configuration #
@@ -850,28 +878,29 @@
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: gerrit
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_verify_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_verify_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
 
 - job-template:
-    name: '{project-name}-jjb-verify'
+    name: "{project-name}-jjb-verify"
     id: github-jjb-verify
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
@@ -883,31 +912,32 @@
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 7
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^(recheck|reverify)$'
+          trigger-phrase: "^(recheck|reverify)$"
           only-trigger-phrase: false
-          status-context: 'JJB Verify'
+          status-context: "JJB Verify"
           permit-all: true
           github-hooks: true
-          included-regions: '{obj:github_included_regions}'
+          included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 ############################
 # JJB Verify Upstream GJJB #
@@ -937,7 +967,7 @@
       - lf-infra-gpg-verify-git-signature
 
 - job-template:
-    name: '{project-name}-jjb-verify-upstream-gjjb'
+    name: "{project-name}-jjb-verify-upstream-gjjb"
     id: gerrit-jjb-verify-upstream-gjjb
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
@@ -947,8 +977,9 @@
     # Default parameters #
     ######################
 
-    git-url: '$GIT_URL/$PROJECT'
+    git-url: "$GIT_URL/$PROJECT"
     submodule-timeout: 10
+    submodule-disable: false
 
     #####################
     # Job Configuration #
@@ -956,17 +987,18 @@
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: ''
-          branch: 'master'
+          git-url: "{git-url}"
+          refspec: ""
+          branch: "master"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: 'LinuxFoundation'
+          server-name: "LinuxFoundation"
           trigger-on:
             - patchset-created-event:
                 exclude-drafts: true
@@ -974,13 +1006,13 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
           projects:
             - project-compare-type: ANT
-              project-pattern: 'releng/global-jjb'
+              project-pattern: "releng/global-jjb"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/master'
+                  branch-pattern: "**/master"
           override-votes: true
           gerrit-build-failed-codereview-value: -1
           gerrit-build-failed-verified-value: 0
@@ -1003,77 +1035,79 @@
     build-timeout: 15
     disable-job: false
     file-patterns: >
-        *.go
-        *.groovy
-        *.java
-        *.py
-        *.sh
-    git-url: '$GIT_URL/$PROJECT'
-    github-url: 'https://github.com'
+      *.go
+      *.groovy
+      *.java
+      *.py
+      *.sh
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
     lhc-version: 0.2.0
-    license-exclude-paths: ''
+    license-exclude-paths: ""
     licenses-allowed: Apache-2.0,EPL-1.0,MIT
-    project-pattern: '**'
+    project-pattern: "**"
     spdx-disable: false
     stream: master
     submodule-timeout: 10
+    submodule-disable: false
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     concurrent: true
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
     properties:
       - lf-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}"
 
     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-license-check:
-          file-patterns: '{file-patterns}'
-          spdx-disable: '{spdx-disable}'
-          lhc-version: '{lhc-version}'
-          license-exclude-paths: '{license-exclude-paths}'
-          licenses-allowed: '{licenses-allowed}'
+          file-patterns: "{file-patterns}"
+          spdx-disable: "{spdx-disable}"
+          lhc-version: "{lhc-version}"
+          license-exclude-paths: "{license-exclude-paths}"
+          licenses-allowed: "{licenses-allowed}"
 
     publishers:
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-license-check'
+    name: "{project-name}-license-check"
     id: gerrit-license-check
     <<: *lf_license_check
 
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
           # Submodules are out of the project's control
           submodule-recursive: false
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: gerrit
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
+          server-name: "{gerrit-server-name}"
           # Trigger should not be overridable as we want to always run
           trigger-on:
             - patchset-created-event:
@@ -1082,45 +1116,46 @@
                 exclude-no-code-change: false
             - draft-published-event
             - comment-added-contains-event:
-                comment-contains-value: recheck$
+                comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project-pattern}'
+              project-pattern: "{project-pattern}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**'
+                  branch-pattern: "**"
 
 - job-template:
-    name: '{project-name}-license-check'
+    name: "{project-name}-license-check"
     id: github-license-check
     <<: *lf_license_check
 
     properties:
       - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
           # Submodules are out of the project's control
           submodule-recursive: false
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^recheck$'
+          trigger-phrase: "^recheck$"
           only-trigger-phrase: false
-          status-context: 'License Check'
+          status-context: "License Check"
           permit-all: true
           github-hooks: true
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 ####################
 # Info YAML Verify #
@@ -1140,7 +1175,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
     #####################
     # Job Configuration #
@@ -1154,71 +1189,73 @@
           - ../shell/info-file-validate.sh
 
 - job-template:
-    name: '{project-name}-info-yaml-verify'
+    name: "{project-name}-info-yaml-verify"
     id: gerrit-info-yaml-verify
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_info_yaml_verify
 
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: gerrit
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_verify_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_verify_triggers}"
           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: REG_EXP
-                  pattern: 'INFO.yaml'
+                  pattern: "INFO.yaml"
 
 - job-template:
-    name: '{project-name}-info-yaml-verify'
+    name: "{project-name}-info-yaml-verify"
     id: github-info-yaml-verify
     <<: *lf_jjb_common
     # yamllint disable-line rule:key-duplicates
     <<: *lf_info_yaml_verify
 
-    github-url: 'https://github.com'
+    github-url: "https://github.com"
     properties:
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^(recheck|reverify)$'
+          trigger-phrase: "^(recheck|reverify)$"
           only-trigger-phrase: false
-          status-context: 'INFO File Verify'
+          status-context: "INFO File Verify"
           permit-all: true
           github-hooks: true
           # included-regions MUST match gerrit file-paths
-          included-regions: 'INFO.yaml'
+          included-regions: "INFO.yaml"
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 ##################
 # OPENSTACK CRON #
@@ -1234,60 +1271,62 @@
     branch: master
     build-days-to-keep: 7
     build-timeout: 10
-    cron: '@hourly'
+    cron: "@hourly"
     disable-job: false
-    git-url: '$GIT_URL/$PROJECT'
-    github-url: 'https://github.com'
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
     openstack-cloud: vex
     openstack-image-cleanup: true
     openstack-image-cleanup-age: 30
     openstack-image-protect: true
+    openstack-port-cleanup: true
     openstack-server-cleanup: true
     openstack-stack-cleanup: true
     openstack-volume-cleanup: true
     stream: master
     submodule-timeout: 10
+    submodule-disable: false
 
     #####################
     # Job Configuration #
     #####################
 
     project-type: freestyle
-    node: '{build-node}'
+    node: "{build-node}"
     concurrent: false
-    disabled: '{disable-job}'
+    disabled: "{disable-job}"
 
     properties:
       - lf-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+          build-days-to-keep: "{build-days-to-keep}"
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - string:
           name: JENKINS_URLS
-          default: '{jenkins-urls}'
+          default: "{jenkins-urls}"
           description: |
-              Space separated list of Jenkins URLs to check for active builds.
+            Space separated list of Jenkins URLs to check for active builds.
 
     wrappers:
       - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
       # Listed after to override openstack-infra-wrappers clouds.yaml definition
       - config-file-provider:
           files:
             - file-id: clouds-yaml
-              target: '$HOME/.config/openstack/clouds.yaml'
+              target: "$HOME/.config/openstack/clouds.yaml"
             - file-id: npmrc
-              target: '$HOME/.npmrc'
+              target: "$HOME/.npmrc"
             - file-id: pipconf
-              target: '$HOME/.config/pip/pip.conf'
+              target: "$HOME/.config/pip/pip.conf"
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
 
     builders:
       - lf-infra-pre-build
@@ -1296,30 +1335,36 @@
       # Stacks
       - conditional-step:
           condition-kind: boolean-expression
-          condition-expression: '{openstack-stack-cleanup}'
+          condition-expression: "{openstack-stack-cleanup}"
           steps:
             - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-stacks.sh
       # Servers
       - conditional-step:
           condition-kind: boolean-expression
-          condition-expression: '{openstack-server-cleanup}'
+          condition-expression: "{openstack-server-cleanup}"
           steps:
             - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-servers.sh
+      # Ports
+      - conditional-step:
+          condition-kind: boolean-expression
+          condition-expression: "{openstack-port-cleanup}"
+          steps:
+            - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-ports.sh
       # Volumes
       - conditional-step:
           condition-kind: boolean-expression
-          condition-expression: '{openstack-volume-cleanup}'
+          condition-expression: "{openstack-volume-cleanup}"
           steps:
             - shell: !include-raw-escape: ../shell/openstack-cleanup-orphaned-volumes.sh
       # Images
       - conditional-step:
           condition-kind: boolean-expression
-          condition-expression: '{openstack-image-protect}'
+          condition-expression: "{openstack-image-protect}"
           steps:
             - shell: !include-raw-escape: ../shell/openstack-protect-in-use-images.sh
       - conditional-step:
           condition-kind: boolean-expression
-          condition-expression: '{openstack-image-cleanup}'
+          condition-expression: "{openstack-image-cleanup}"
           steps:
             - inject:
                 properties-content: OS_IMAGE_CLEANUP_AGE={openstack-image-cleanup-age}
@@ -1329,34 +1374,36 @@
       - lf-infra-publish
 
 - job-template:
-    name: '{project-name}-openstack-cron'
+    name: "{project-name}-openstack-cron"
     id: gerrit-openstack-cron
     <<: *lf_openstack_cron
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: 'refs/heads/{branch}'
-          branch: '{branch}'
+          git-url: "{git-url}"
+          refspec: "refs/heads/{branch}"
+          branch: "{branch}"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
 - job-template:
-    name: '{project-name}-openstack-cron'
+    name: "{project-name}-openstack-cron"
     id: github-openstack-cron
     <<: *lf_openstack_cron
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: ''
-          branch: 'refs/heads/{branch}'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: ""
+          branch: "refs/heads/{branch}"
           submodule-recursive: true
-          submodule-timeout: '{submodule-timeout}'
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
 ################
 # Packer Merge #
@@ -1378,23 +1425,26 @@
 
     parameters:
       - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
+          project: "{project}"
+          stream: "{stream}"
+          branch: "{branch}"
       - lf-packer-parameters:
-          packer-version: '{packer-version}'
+          packer-version: "{packer-version}"
 
     builders:
       - lf-infra-packer-build:
-          openstack: '{openstack}'
-          openstack-cloud: '{openstack-cloud}'
-          packer-cloud-settings: '{packer-cloud-settings}'
-          packer-version: '{packer-version}'
-          platform: '{platforms}'
-          template: '{templates}'
+          openstack: "{openstack}"
+          openstack-cloud: "{openstack-cloud}"
+          packer-cloud-settings: "{packer-cloud-settings}"
+          packer-version: "{packer-version}"
+          platform: "{platforms}"
+          template: "{templates}"
+      - description-setter:
+          regexp: '(\s+.*)(ZZCI\s+.*\d+-\d+\.\d+)'
+          description: 'Image: \2'
 
 - job-template:
-    name: '{project-name}-packer-merge-{platforms}-{templates}'
+    name: "{project-name}-packer-merge-{platforms}-{templates}"
     id: gerrit-packer-merge
     <<: *lf_packer_common
     # yamllint disable-line rule:key-duplicates
@@ -1404,12 +1454,12 @@
     # Default parameters #
     ######################
 
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
 
     gerrit_merge_triggers:
       - change-merged-event
       - comment-added-contains-event:
-          comment-contains-value: remerge$
+          comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$'
 
     #####################
     # Job Configuration #
@@ -1417,25 +1467,26 @@
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
-          choosing-strategy: gerrit
-          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
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_merge_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_merge_triggers}"
           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: REG_EXP
                   pattern: 'packer\/provision\/.*\.sh'
@@ -1453,7 +1504,7 @@
                   pattern: 'packer\/vars\/{platforms}\.json'
 
 - job-template:
-    name: '{project-name}-packer-merge-{platforms}-{templates}'
+    name: "{project-name}-packer-merge-{platforms}-{templates}"
     id: github-packer-merge
     <<: *lf_packer_common
     # yamllint disable-line rule:key-duplicates
@@ -1465,39 +1516,40 @@
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 7
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
+          url: "{git-clone-url}{github-org}/{project}"
           refspec: >
-              +refs/heads/*:refs/remotes/origin/*
-              +refs/pull/*:refs/remotes/origin/pr/*
-          branch: '$GERRIT_REFSPEC'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+            +refs/heads/*:refs/remotes/origin/*
+            +refs/pull/*:refs/remotes/origin/pr/*
+          branch: "$GERRIT_REFSPEC"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
-      - timed: '{obj:cron}'
+      - timed: "{obj:cron}"
       - github
       - pollscm:
-          cron: ''
+          cron: ""
 
       - github-pull-request:
-          trigger-phrase: '^remerge$'
+          trigger-phrase: "^remerge$"
           only-trigger-phrase: true
-          status-context: 'Packer {platforms}-{templates} Merge'
+          status-context: "Packer {platforms}-{templates} Merge"
           permit-all: true
           github-hooks: true
           org-list:
-            - '{github-org}'
-          white-list: '{obj:github_pr_whitelist}'
-          admin-list: '{obj:github_pr_admin_list}'
+            - "{github-org}"
+          white-list: "{obj:github_pr_whitelist}"
+          admin-list: "{obj:github_pr_admin_list}"
           # included-regions MUST match Gerrit Trigger file-paths
           included-regions:
             - 'packer\/provision\/.*\.sh'
@@ -1508,7 +1560,7 @@
             - 'packer\/templates\/{templates}\.json'
             - 'packer\/vars\/{platforms}\.json'
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
 
 #################
 # Packer Verify #
@@ -1532,7 +1584,7 @@
           exclude-no-code-change: false
       - draft-published-event
       - comment-added-contains-event:
-          comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$'
+          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
 
     gerrit_trigger_file_paths:
       - compare-type: REG_EXP
@@ -1550,13 +1602,13 @@
 
     builders:
       - lf-infra-packer-validate:
-          openstack: '{openstack}'
-          openstack-cloud: '{openstack-cloud}'
-          packer-cloud-settings: '{packer-cloud-settings}'
-          packer-version: '{packer-version}'
+          openstack: "{openstack}"
+          openstack-cloud: "{openstack-cloud}"
+          packer-cloud-settings: "{packer-cloud-settings}"
+          packer-version: "{packer-version}"
 
 - job-template:
-    name: '{project-name}-packer-verify'
+    name: "{project-name}-packer-verify"
     id: gerrit-packer-verify
     <<: *lf_packer_common
     # yamllint disable-line rule:key-duplicates
@@ -1566,7 +1618,7 @@
     # Default parameters #
     ######################
 
-    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
 
     #####################
     # Job Configuration #
@@ -1574,28 +1626,29 @@
 
     scm:
       - lf-infra-gerrit-scm:
-          git-url: '{git-url}'
-          refspec: '$GERRIT_REFSPEC'
-          branch: '$GERRIT_BRANCH'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          git-url: "{git-url}"
+          refspec: "$GERRIT_REFSPEC"
+          branch: "$GERRIT_BRANCH"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: gerrit
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - gerrit:
-          server-name: '{gerrit-server-name}'
-          trigger-on: '{obj:gerrit_verify_triggers}'
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_verify_triggers}"
           projects:
             - project-compare-type: ANT
-              project-pattern: '{project}'
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: '**/{branch}'
-              file-paths: '{obj:gerrit_trigger_file_paths}'
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
 
 - job-template:
-    name: '{project-name}-packer-verify'
+    name: "{project-name}-packer-verify"
     id: github-packer-verify
     <<: *lf_packer_common
     # yamllint disable-line rule:key-duplicates
@@ -1607,28 +1660,369 @@
 
     properties:
       - lf-infra-properties:
-          project: '{project}'
+          project: "{project}"
           build-days-to-keep: 7
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: "{github-url}/{github-org}/{project}"
 
     scm:
       - lf-infra-github-scm:
-          url: '{git-clone-url}{github-org}/{project}'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
-          branch: '$sha1'
-          submodule-recursive: '{submodule-recursive}'
-          submodule-timeout: '{submodule-timeout}'
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
           choosing-strategy: default
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
     triggers:
       - github-pull-request:
-          trigger-phrase: '^(recheck|reverify)$'
+          trigger-phrase: "^(recheck|reverify)$"
           only-trigger-phrase: false
-          status-context: 'Packer Verify'
+          status-context: "Packer Verify"
           permit-all: true
           github-hooks: true
-          included-regions: '{obj:github_included_regions}'
+          included-regions: "{obj:github_included_regions}"
           white-list-target-branches:
-            - '{branch}'
+            - "{branch}"
+
+#################
+# Puppet Verify #
+#################
+
+- lf_puppet_verify: &lf_puppet_verify
+    name: lf-puppet-verify
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    build-days-to-keep: 7
+    build-timeout: 15
+    disable-job: false
+    git-url: "$GIT_URL/$GERRIT_PROJECT"
+    github-url: "https://github.com"
+    parallel: true
+    puppet-dir: ""
+    puppet-lint-version: 2.3.6
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: ".*"
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - ".*"
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: "{build-node}"
+    concurrent: true
+    disabled: "{disable-job}"
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
+      - lf-puppet-parameters:
+          puppet-lint-version: "{puppet-lint-version}"
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    builders:
+      - shell: !include-raw-escape: ../shell/puppet-lint.sh
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    name: "{project-name}-puppet-verify"
+    id: gerrit-puppet-verify
+    <<: *lf_puppet_verify
+
+    ######################
+    # Default parameters #
+    ######################
+
+    gerrit_verify_triggers:
+      - patchset-created-event:
+          exclude-drafts: true
+          exclude-trivial-rebase: false
+          exclude-no-code-change: false
+      - draft-published-event
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$'
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    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: gerrit
+
+    triggers:
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_verify_triggers}"
+          projects:
+            - project-compare-type: ANT
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
+
+- job-template:
+    name: "{project-name}-puppet-verify"
+    id: github-puppet-verify
+    <<: *lf_puppet_verify
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    properties:
+      - lf-infra-properties:
+          project: "{project}"
+          build-days-to-keep: 7
+      - github:
+          url: "{github-url}/{github-org}/{project}"
+
+    scm:
+      - lf-infra-github-scm:
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    triggers:
+      - github-pull-request:
+          trigger-phrase: "^(recheck|reverify)$"
+          only-trigger-phrase: false
+          status-context: "Puppet Verify"
+          permit-all: true
+          github-hooks: true
+          included-regions: "{obj:github_included_regions}"
+          white-list-target-branches:
+            - "{branch}"
+
+#########
+# Sonar #
+#########
+
+- lf_sonar_common: &lf_sonar_common
+    name: lf-sonar-common
+
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+
+    branch: master # Sonar should always be run on master branch
+    build-days-to-keep: 7
+    build-timeout: 60
+    cron: "H H * * *" # run daily
+    disable-job: false
+    git-url: "$GIT_URL/$PROJECT"
+    github-url: "https://github.com"
+    stream: master
+    submodule-recursive: true
+    submodule-timeout: 10
+    submodule-disable: false
+
+    # Sonar properties
+    sonar-task: ""
+    sonar-properties: ""
+    sonar-java-opts: ""
+    sonar-additional-args: ""
+
+    gerrit_trigger_file_paths:
+      - compare-type: REG_EXP
+        pattern: ".*"
+
+    # github_included_regions MUST match gerrit_trigger_file_paths
+    github_included_regions:
+      - ".*"
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: "{build-node}"
+
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    disabled: "{disable-job}"
+
+    parameters:
+      - lf-infra-parameters:
+          project: "{project}"
+          branch: "{branch}"
+          stream: "{stream}"
+      - string:
+          name: ARCHIVE_ARTIFACTS
+          default: "{archive-artifacts}"
+          description: Artifacts to archive to the logs server.
+
+    publishers:
+      - lf-infra-publish
+
+- lf_sonar_builders: &lf_sonar_builders
+    name: lf-sonar-builders
+    builders:
+      - lf-infra-pre-build
+      - lf-infra-sonar:
+          sonar-task: "{sonar-task}"
+          sonar-properties: "{sonar-properties}"
+          sonar-java-opts: "{sonar-java-opts}"
+          sonar-additional-args: "{sonar-additional-args}"
+
+- lf_sonar_builders_prescan: &lf_sonar_builders_prescan
+    name: lf-sonar-builders-prescan
+    builders:
+      - lf-infra-pre-build
+      - lf-infra-sonar-with-prescan:
+          sonar-task: "{sonar-task}"
+          sonar-properties: "{sonar-properties}"
+          sonar-java-opts: "{sonar-java-opts}"
+          sonar-additional-args: "{sonar-additional-args}"
+
+- lf_sonar_gerrit_common: &lf_sonar_gerrit_common
+    name: lf-sonar-gerrit-common
+    gerrit_sonar_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: '^Patch Set\s+\d+:\s+run-sonar\s*$'
+
+    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
+
+    triggers:
+      - timed: "{obj:cron}"
+      - gerrit:
+          server-name: "{gerrit-server-name}"
+          trigger-on: "{obj:gerrit_sonar_triggers}"
+          projects:
+            - project-compare-type: "ANT"
+              project-pattern: "{project}"
+              branches:
+                - branch-compare-type: "ANT"
+                  branch-pattern: "**/{branch}"
+              file-paths: "{obj:gerrit_trigger_file_paths}"
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
+
+- lf_sonar_github_common: &lf_sonar_github_common
+    name: lf-sonar-github-common
+    properties:
+      - lf-infra-properties:
+          build-days-to-keep: "{build-days-to-keep}"
+      - github:
+          url: "{github-url}/{github-org}/{project}"
+
+    scm:
+      - lf-infra-github-scm:
+          url: "{git-clone-url}{github-org}/{project}"
+          refspec: "+refs/pull/*:refs/remotes/origin/pr/*"
+          branch: "$sha1"
+          submodule-recursive: "{submodule-recursive}"
+          submodule-timeout: "{submodule-timeout}"
+          submodule-disable: "{submodule-disable}"
+          choosing-strategy: default
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
+    triggers:
+      - github-pull-request:
+          trigger-phrase: "^run-sonar$"
+          only-trigger-phrase: false
+          status-context: "Python Sonar"
+          permit-all: true
+          github-hooks: true
+          white-list-target-branches:
+            - "{branch}"
+          included-regions: "{obj:github_included_regions}"
+
+- job-template:
+    name: "{project-name}-sonar"
+    id: gerrit-sonar
+    <<: *lf_sonar_common
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_builders
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_gerrit_common
+
+- job-template:
+    name: "{project-name}-sonar"
+    id: github-sonar
+    <<: *lf_sonar_common
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_builders
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_github_common
+
+- job-template:
+    name: "{project-name}-sonar-prescan"
+    id: gerrit-sonar-prescan
+    <<: *lf_sonar_common
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_builders_prescan
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_gerrit_common
+
+- job-template:
+    name: "{project-name}-sonar-prescan"
+    id: github-sonar-prescan
+    <<: *lf_sonar_common
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_builders_prescan
+    # yamllint disable-line rule:key-duplicates
+    <<: *lf_sonar_github_common