X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=e3dd10baa64d78104f18f6b5fcb7568e831a96a1;hb=79ae80365b00e094dd4eec7bd2f8aa23d2720d0d;hp=7aba08444eda7e7063c7338019f496f94653f5e4;hpb=32872573cb431a8479e75d159350b8184bb9d62e;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 7aba0844..e3dd10ba 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -3,6 +3,7 @@
     name: '{project-name}-ci-jobs'
 
     jobs:
+      - gerrit-jenkins-cfg-merge
       - gerrit-jjb-deploy-job
       - gerrit-jjb-merge
       - gerrit-jjb-verify
@@ -11,6 +12,7 @@
     name: '{project-name}-github-ci-jobs'
 
     jobs:
+      - github-jenkins-cfg-merge
       - github-jjb-deploy-job
       - github-jjb-merge
       - github-jjb-verify
@@ -78,7 +80,7 @@
     ######################
 
     branch: master
-    build-timeout: 45
+    build-timeout: 90
     stream: master
     submodule-recursive: true
     packer-cloud-settings: packer-cloud-env
@@ -248,6 +250,97 @@
     publishers:
       - lf-infra-publish
 
+##########################################
+# Jenkins Configuration Management Merge #
+##########################################
+
+- builder:
+    name: lf-jenkins-cfg-global-vars
+    builders:
+      - lf-infra-jjbini
+      - inject:
+          properties-content: 'jenkins_silos={jenkins-silos}'
+      - shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh
+      - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini"
+
+- lf_jenkins_configuration: &lf_jenkins_cfg_merge
+    name: lf-jenkins-cfg-merge
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    jenkins-silos: production sandbox
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: false
+
+    properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 1
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: ''
+          branch: master
+          lftools-version: '{lftools-version}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 10
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    builders:
+      - shell: !include-raw-escape:
+          - ../shell/lftools-install.sh
+      - lf-jenkins-cfg-global-vars:
+          jenkins-silos: '{jenkins-silos}'
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    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}'
+          submodule-recursive: true
+          choosing-strategy: default
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+- job-template:
+    name: '{project-name}-jenkins-cfg-merge'
+    id: github-jenkins-cfg-merge
+    <<: *lf_jenkins_cfg_merge
+
+    properties:
+      - github:
+          url: '{git-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: true
+          choosing-strategy: default
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+
 ##################
 # JJB DEPLOY JOB #
 ##################
@@ -264,7 +357,7 @@
     stream: master
     gerrit_jjb_deploy_job_triggers:
       - comment-added-contains-event:
-          comment-contains-value: jjb-deploy (?!\*+$).+$
+          comment-contains-value: 'jjb-deploy[:]* (?!\*+$).+$'
 
     #####################
     # Job Configuration #