Update Ubuntu mininet image and labels

We are currently supporting the following:
- Ubuntu1404 with mininet default
- Ubuntu1604 with mininet-ovs-2.5

Change-Id: I550cbf436755ac2a9a2c1e104c6169383b5a6354
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index ef38654e8fe4c1e7d138e674daff647d5e6a828c..cb15c2ec1acbe4a7e832ab0892a3ac754f408362 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -248,30 +248,6 @@ Pool: ODLRPC
         <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.3.json</td>
         <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/mininet-ubuntu.sh</td>
       </tr>
-      <tr>
-        <td colspan="4">
-          Ubuntu 14.04 (Trusty) system with ovs 2.3 and mininet 2.2.1
-        </td>
-      </tr>
-
-      <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1404-mininet-ovs-25-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1404-mininet-ovs-25-2c-2g</td>
-        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.5.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/mininet-ubuntu.sh</td>
-      </tr>
-      <tr>
-        <td colspan="4">
-          Ubuntu 14.04 (Trusty) system with ovs 2.5 and mininet 2.2.2
-        </td>
-      </tr>
-
-      <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1604-mininet-ovs-25-2c-4g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1604-mininet-ovs-25-2c-4g</td>
-        <td><b>Packer Template</b><br/> releng/builder/packer/templates/mininet-ovs-2.5.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/mininet-ubuntu.sh</td>
-      </tr>
       <tr>
         <td colspan="4">
           Ubuntu 16.04 (Xenial) system with ovs 2.5 and mininet 2.2.1