Merge "Allow packer-merge job to test WIP patch"

diff --combined docs/jjb/lf-ci-jobs.rst
index 9e0941c,b270b75..f55b5dc
--- 1/docs/jjb/lf-ci-jobs.rst
--- 2/docs/jjb/lf-ci-jobs.rst
+++ b/docs/jjb/lf-ci-jobs.rst
@@@ -312,9 -312,6 +312,9 @@@ Example
  .. literalinclude:: ../../.jjb-test/lf-ci-jobs/jenkins-cfg-verify.yaml
     :language: yaml
  
 +
 +.. _jenkins-sandbox-cleanup:
 +
  Jenkins Sandbox Cleanup
  -----------------------
  
@@@ -339,15 -336,13 +339,15 @@@ Cleanup Jenkins Sandbox of jobs and vie
      :cron: Schedule to run job. (default: '0 8 * * 6')
  
  
 +.. _jjb-deploy:
 +
  JJB Deploy Job
  --------------
  
 -Deploy jobs to jenkins-sandbox system via code review comment
 +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.
 +``jenkins-jobs update`` to push a patch defined by the comment.
  
  :Template names:
  
@@@ -360,7 -355,7 +360,7 @@@
      .. note::
  
         JOB_NAME can include the * wildcard character to push multiple jobs
 -       matching the pattern. For example `jjb-deploy builder-jjb-*`` will push
 +       matching the pattern. For example ``jjb-deploy builder-jjb-*`` will push
         all builder-jjb-* jobs to the sandbox system.
  
  :Required parameters:
@@@ -375,8 -370,6 +375,8 @@@
      :gerrit_jjb_deploy_job_triggers: Override Gerrit Triggers.
  
  
 +.. _jjb-merge:
 +
  JJB Merge
  ---------
  
@@@ -416,8 -409,6 +416,8 @@@ Runs `jenkins-jobs update` to update pr
          (default defined by lf_jjb_common)
  
  
 +.. _jjb-verify:
 +
  JJB Verify
  ----------
  
@@@ -661,6 -652,19 +661,19 @@@ Packer Merge job runs `packer build` t
  
      :gerrit_verify_triggers: Override Gerrit Triggers.
  
+ Test an in-progress patch
+ ^^^^^^^^^^^^^^^^^^^^^^^^^
+ 
+ To test an in-progress patch from a GitHub Pull Request. Upload this
+ job to the :doc:`Jenkins Sandbox <lfdocs:jenkins-sandbox>`. Then when manually
+ building the job replace the GERRIT_REFSPEC parameter with the GitHub Pull
+ Request number of the patch you would like to test.
+ 
+ Example GitHub:
+ 
+ .. code-block:: none
+ 
+    GERRIT_REFSPEC: origin/pr/49/merge
  
  .. _gjjb-packer-verify:
  

diff --combined jjb/lf-ci-jobs.yaml
index 5fe95a6,450fcfa..f097260
--- 1/jjb/lf-ci-jobs.yaml
--- 2/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@@ -102,7 -102,7 +102,7 @@@
      disable-job: false
      github-url: 'https://github.com'
      jjb-cache: '$HOME/.cache/jenkins_jobs'
 -    jjb-version: 2.2.1
 +    jjb-version: 2.8.0
      stream: master
      submodule-recursive: true
      submodule-timeout: 10
@@@ -1482,8 -1482,10 +1482,10 @@@
      scm:
        - lf-infra-github-scm:
            url: '{git-clone-url}{github-org}/{project}'
-           refspec: ''
-           branch: 'refs/heads/{branch}'
+           refspec: >
+               +refs/heads/*:refs/remotes/origin/*
+               +refs/pull/*:refs/remotes/origin/pr/*
+           branch: '$GERRIT_REFSPEC'
            submodule-recursive: '{submodule-recursive}'
            submodule-timeout: '{submodule-timeout}'
            choosing-strategy: default