X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=docs%2Fjenkins.rst;h=ad8d95d0b655eaa90935190340f3b9d94160c05f;hb=f38f8231e836d47f258f0c74e82fc6e0b24432b5;hp=e8a0c1962de7d60a661f0ac4334d9953beb9654f;hpb=751859fe7ee4fbce8042d983c27bd5a0f28f1843;p=releng%2Fbuilder.git

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index e8a0c1962..ad8d95d0b 100644
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -204,23 +204,19 @@ accounts in the cloud so should ensure consistent performance.
      - CPUs
      - Memory
 
-   * - odl-standard-1
-     - 1
-     - 4
-
-   * - odl-standard-2
+   * - v3-standard-2
      - 2
      - 8
 
-   * - odl-standard-4
+   * - v3-standard-4
      - 4
      - 16
 
-   * - odl-standard-8
+   * - v3-standard-8
      - 8
      - 32
 
-   * - odl-standard-16
+   * - v3-standard-16
      - 16
      - 64
 
@@ -292,38 +288,14 @@ Pool: ODLVEX
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1604-mininet-ovs-25-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1604-mininet-ovs-25-2c-2g</td>
-        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.5.json</td>
-        <td><b>Playbook</b><br/> releng/builder/packer/provision//mininet-ovs-2.5.yaml</td>
-      </tr>
-      <tr>
-        <td colspan="4">
-          Basic Ubuntu 16.04 (Xenial) system with ovs 2.5 and mininet 2.2.1
-        </td>
-      </tr>
-
-      <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1604-mininet-ovs-26-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1604-mininet-ovs-26-2c-2g</td>
-        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.6.json</td>
-        <td><b>Playbook</b><br/> releng/builder/packer/provision//mininet-ovs-2.6.yaml</td>
-      </tr>
-      <tr>
-        <td colspan="4">
-          Ubuntu 16.04 (Xenial) system with ovs 2.6 and mininet 2.2.1
-        </td>
-      </tr>
-
-      <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1604-mininet-ovs-28-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1604-mininet-ovs-28-2c-2g</td>
+        <td><b>Jenkins Labels</b><br/> ubuntu1804-mininet-ovs-28-2c-2g</td>
+        <td><b>Minion Template names</b><br/> ubuntu1804-mininet-ovs-28-2c-2g</td>
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.8.json</td>
         <td><b>Playbook</b><br/> releng/builder/packer/provision//mininet-ovs-2.8.yaml</td>
       </tr>
       <tr>
         <td colspan="4">
-          Ubuntu 16.04 (Xenial) system with ovs 2.8 and mininet 2.2.1
+          Ubuntu 18.04 (Bionic Beaver) system with ovs 2.8
         </td>
       </tr>
 
@@ -357,18 +329,6 @@ Pool: ODLVEX
         </td>
       </tr>
 
-      <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1604-gbp-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1604-gbp-2c-2g</td>
-        <td><b>Packer Template</b><br/> releng/builder/packer/templates/gbp.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/gpb.sh</td>
-      </tr>
-      <tr>
-        <td colspan="4">
-          Ubuntu 16.04 (Xenial) node with latest OVS and docker installed. Used by Group Based Policy.
-        </td>
-      </tr>
-
     </table>
 
 Pool: ODLVEX - HOT (Heat Orchestration Templates)
@@ -821,19 +781,17 @@ Maven Properties
 ----------------
 
 We provide a properties which your job can take advantage of if you want to do
-something different depending on the job type that is run. If you create a
-profile that activates on a property listed blow. The JJB templated jobs will
-be able to activate the profile during the build to run any custom code you
-wish to run in your project.
+trigger a different configuration depending on job type. You can create a
+profile that activates on a property listed below. The JJB templated jobs will
+activate the profile during the build to run any custom code configuration you
+wish to run for this job type.
 
 .. code-block:: bash
 
-    -Dmerge   : This flag is passed in our Merge job and is equivalent to the
-                Maven property
-                <merge>true</merge>.
-    -Dsonar   : This flag is passed in our Sonar job and is equivalent to the
-                Maven property
-                <sonar>true</sonar>.
+    -Dmerge   : The Merge job sets this flag and is the same as setting the
+                Maven property <merge>true</merge>.
+    -Dsonar   : The Sonar job sets this flag and is the same as setting the
+                Maven property <sonar>true</sonar>.
 
 .. _odl-jenkins-sandbox:
 
@@ -842,7 +800,7 @@ Jenkins Sandbox
 
 URL: https://jenkins.opendaylight.org/sandbox
 
-Jenkins Sandbox documentation can be found in the
+Jenkins Sandbox documentation is available in the
 :doc:`LF Jenkins Sandbox Guide <lfdocs:jenkins-sandbox>`.
 
 .. _example-jenkins.ini: https://git.opendaylight.org/gerrit/gitweb?p=releng/builder.git;a=blob;f=jenkins.ini.example