Remove unused views

[releng/builder.git] / docs / jenkins.rst

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 6cb6585836fda784667c9043e242171356972763..812f29b3412c85a1af62b30881f810b4d072824c 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -204,50 +204,38 @@ accounts in the cloud so should ensure consistent performance.
      - CPUs
      - Memory
 
-   * - v2-standard-1
+   * - odl-standard-1
      - 1
      - 4
 
-   * - v2-standard-2
+   * - odl-standard-2
      - 2
      - 8
 
-   * - v2-standard-4
+   * - odl-standard-4
      - 4
      - 16
 
-   * - v2-standard-8
+   * - odl-standard-8
      - 8
      - 32
 
-   * - v2-standard-16
+   * - odl-standard-16
      - 16
      - 64
 
-   * - v2-highcpu-1
-     - 1
-     - 1
-
-   * - v2-highcpu-2
+   * - odl-highcpu-2
      - 2
      - 2
 
-   * - v2-highcpu-4
+   * - odl-highcpu-4
      - 4
      - 4
 
-   * - v2-highcpu-8
+   * - odl-highcpu-8
      - 8
      - 8
 
-   * - v2-highcpu-16
-     - 16
-     - 16
-
-   * - v2-highcpu-32
-     - 32
-     - 32
-
 Pool: ODLVEX
 ^^^^^^^^^^^^
 
@@ -817,6 +805,12 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
           cherry-pick 59/60259/17 and build netvirt, finally it will checkout latest distribution
           code and build a distribution. The resulting distribution is stored in Nexus and the URL
           is stored in a variable called BUNDLE_URL visible in the job console.
+          This job also accepts a gerrit topic, for example: multipatch-build:topic=binding-tlc-rpc,
+          in this case the job will find all patches in the topic binding-tlc-rpc for the projects
+          specified in the BUILD_ORDER parameter and will build all projects from the first a patch
+          has been found, for successive projects the branch HEAD is used if no patch is found.
+          The job uses patch numbers to sort patches in the same project.
+          Use multipatch-build-fast (vs multipatch-build) for building projects fast (-Pq).
           This job should not alter Gerrit votes for a given patch, nor will do anything with the
           given patch unless the patch is added to the build list.
         </td>
@@ -886,6 +880,9 @@ example is provided by releng/builder at `example-jenkins.ini`_.
     # Edit jenkins.ini with your username, API token and ODL's sandbox URL
     $ cat jenkins.ini
     <snip>
+    [job_builder]
+    retain_anchors=True
+
     [jenkins]
     user=<your ODL username>
     password=<your ODL Jenkins sandbox API token>
@@ -943,6 +940,9 @@ Once you've `configured your \`jenkins.ini\` <Configuration_>`_ and `verified yo
 JJB jobs <Testing Jobs_>`_ produce valid XML descriptions of Jenkins jobs you
 can push them to the Jenkins sandbox.
 
+Add the --jobs-only (-j) option to push only jobs to Jenkins sandbox. Pushing
+views to Jenkins sandbox requires admin access.
+
 .. important::
 
     When pushing with `jenkins-jobs`, a log message with the number
@@ -962,7 +962,7 @@ can push them to the Jenkins sandbox.
     .. code-block:: bash
 
         # Don't push all jobs by omitting the final param! (ctrl+c to abort)
-        jenkins-jobs --conf jenkins.ini update jjb/ <job-name>
+        jenkins-jobs --conf jenkins.ini update -j jjb/ <job-name>
 
 Alternatively, you can push a job to the Jenkins sandbox with a special comment in a
 releng/builder gerrit patch. The job will be based off of the code your patch is