From bbe66c26efe78ffd89fcc9ebe6c277559f4ea9de Mon Sep 17 00:00:00 2001
From: Anil Belur <abelur@linuxfoundation.org>
Date: Thu, 18 Jun 2020 12:00:58 +1000
Subject: [PATCH] Update docs with Ubuntu version and node label

- Ubuntu 14.04 is deprecated.
- Supported mininet and ovs versions supported

Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Change-Id: Ib13e381636b875e7cc2988a02f67a52f50b8425a
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---
 docs/jenkins.rst | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 486ce8578..ed670b20d 100644
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -292,27 +292,38 @@ Pool: ODLVEX
       </tr>
 
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> ubuntu1404-mininet-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1404-mininet-2c-2g</td>
-        <td><b>Packer Template</b><br/>
-        releng/builder/packer/teamplates/mininet.json</td>
-        <td><b>Spinup Script</b><br/> releng/builder/jenkins-scripts/mininet-ubuntu.sh</td>
+        <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>Script</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">
-          Basic Ubuntu 14.04 (Trusty) system with ovs 2.0.2 and mininet 2.1.0
+          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/> ubuntu1404-mininet-ovs-23-2c-2g</td>
-        <td><b>Minion Template names</b><br/> ubuntu1404-mininet-ovs-23-2c-2g</td>
-        <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>
+        <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>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.5 and mininet 2.2.1
+          Ubuntu 16.04 (Xenial) system with ovs 2.8 and mininet 2.2.1
         </td>
       </tr>
 
-- 
2.36.6