X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=b0d699ac076d7c7c12d30aff3e2eb467d820ddcd;hb=e404e86b3c141d37504a8cdb653b047e939a8d77;hp=09dc191ace9d35202c7a8231909eaaa61982c78c;hpb=92a481651941f5e235ce7205ebed1a7d0c6501f8;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 09dc191a..b0d699ac 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -8,6 +8,7 @@
     jjb-version: 1.6.2
 
     jobs:
+      - gerrit-jjb-deploy-job
       - gerrit-jjb-merge
       - gerrit-jjb-verify
 
@@ -20,6 +21,7 @@
     jjb-version: 1.6.2
 
     jobs:
+      - github-jjb-deploy-job
       - github-jjb-merge
       - github-jjb-verify
 
@@ -61,6 +63,28 @@
             - 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'
+
+- lf_packer_verify_file_paths: &lf_packer_verify_file_paths
+    name: lf-packer-verify-file-paths
+    file-paths:
+      # Common files for all projects
+      - compare-type: ANT
+        pattern: 'packer/vars/**.json'
+      - compare-type: ANT
+        pattern: 'packer/templates/**.json'
+      - compare-type: ANT
+        pattern: 'packer/provision/**.sh'
+      - compare-type: ANT
+        pattern: 'packer/provision/lib/**'
+
 - lf_packer_file_paths: &lf_packer_file_paths
     name: lf-packer-file-paths
     file-paths:
@@ -252,6 +276,136 @@
     publishers:
       - lf-infra-publish
 
+##################
+# JJB DEPLOY JOB #
+##################
+
+- lf_jjb_deploy_job: &lf_jjb_deploy_job
+    name: lf-jjb-deploy-job
+
+    # Deploy jobs to jenkins-sandbox system via code review comment
+    #
+    # This job checks out the current code review patch and then runs a
+    # `jenkins-jobs update` to push a patch defined by the comment.
+    #
+    # Comment Trigger: jjb-deploy JOB_NAME
+    #
+    # JOB_NAME can include the * wildcard character to push multiple jobs
+    # matching the pattern. For example `jjb-deploy builder-jjb-*`` will push
+    # all builder-jjb-* jobs to the sandbox system.
+    #
+    # Required parameters:
+    #
+    #     :build-node: The node to run build on.
+    #     :jenkins-ssh-credential: Credential to use for SSH. (Generally should
+    #         be configured in defaults.yaml)
+    #
+    # Optional parameters:
+    #
+    #     :git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
+    #     :gerrit_jjb_deploy_job_triggers: Override Gerrit Triggers.
+
+    ######################
+    # Default parameters #
+    ######################
+
+    branch: master
+    git-url: '$GIT_URL/$GERRIT_PROJECT'
+    stream: master
+    gerrit_jjb_deploy_job_triggers:
+      - comment-added-contains-event:
+          comment-contains-value: jjb-deploy (?!\*+$).+$
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    project-type: freestyle
+    node: '{build-node}'
+    concurrent: true
+
+    properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: 1
+
+    parameters:
+      - lf-infra-parameters:
+          project: '{project}'
+          stream: '{stream}'
+          branch: '{branch}'
+          lftools-version: '{lftools-version}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: 5
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    builders:
+      - lf-pip-install:
+          pip-packages: jenkins-job-builder
+      - lf-infra-jjbini-sandbox
+      - shell: !include-raw-escape: ../shell/jjb-deploy-job.sh
+
+    publishers:
+      - lf-infra-publish
+
+- job-template:
+    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}'
+          submodule-recursive: true
+          choosing-strategy: default
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on: '{obj:gerrit_jjb_deploy_job_triggers}'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**/{branch}'
+
+- job-template:
+    name: '{project-name}-jjb-deploy-job'
+    id: github-jjb-deploy-job
+    <<: *lf_jjb_deploy_job
+
+    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: '{branch}'
+          submodule-recursive: true
+          choosing-strategy: default
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - lf-infra-github-pr-trigger:
+          trigger-phrase: '^jjb-deploy (?!\*+$).+$'
+          only-trigger-phrase: true
+          status-context: 'JJB Deploy Job'
+          permit-all: true
+          github-hooks: true
+          github-org: ''
+          github_pr_whitelist:
+            - ''
+          github_pr_admin_list:
+            - ''
+
 #############
 # JJB Merge #
 #############
@@ -407,7 +561,7 @@
 
     gerrit_verify_triggers:
       - patchset-created-event:
-          exclude-drafts: false
+          exclude-drafts: true
           exclude-trivial-rebase: false
           exclude-no-code-change: false
       - draft-published-event
@@ -665,7 +819,7 @@
 
     gerrit_verify_triggers:
       - patchset-created-event:
-          exclude-drafts: false
+          exclude-drafts: true
           exclude-trivial-rebase: false
           exclude-no-code-change: false
       - draft-published-event
@@ -711,7 +865,7 @@
               branches:
                 - branch-compare-type: ANT
                   branch-pattern: '**/{branch}'
-              <<: *lf_packer_file_paths
+              <<: *lf_packer_verify_file_paths
 
 - job-template:
     name: '{project-name}-packer-verify'