Merge "Migrate mininet to CP ubuntu-16.04.json"

[releng/builder.git] / jjb / releng-jobs.yaml

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 2d5d8358cc28450b14902019a79e5872e0799b90..27d73dd6df85333c5f67b93aeff70f6cb3586fd6 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -51,16 +51,6 @@
 
     templates:
       - gbp
-      - mininet-ovs-2.5:
-          build-timeout: 60
-      - mininet-ovs-2.6:
-          build-timeout: 75
-
-    exclude:
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.5
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.6
 
 - job-template:
     name: builder-check-poms