Merge "Migrate snmp to global-jjb Maven jobs"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index e25c33e1ba2d578fbc71b2263cfa1baa6fad2e2e..53a57d30ab5e1e34d9f8bad145b95a7816672db7 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -3,8 +3,8 @@
     name: builder-jobs
     jobs:
       - '{project-name}-ci-jobs'
-      - '{project-name}-verify-tox-{stream}'
-      - 'builder-check-poms'
+      - builder-check-poms
+      - gerrit-tox-verify
       # OpenStack Related
       - 'builder-verify-image-visibility'
       - 'builder-cleanup-old-images'
@@ -46,7 +46,8 @@
           build-timeout: 60
       - devstack-pre-pip-pike:
           build-timeout: 75
-      - docker
+      - docker:
+          build-timeout: 60
       - gbp
       - java-builder:
           build-timeout: 75
@@ -82,6 +83,8 @@
         templates: docker
       - platforms: ubuntu-14.04
         templates: mininet-ovs-2.5
+      - platforms: ubuntu-14.04
+        templates: mininet-ovs-2.6
       - platforms: ubuntu-16.04
         templates: java-builder
       - platforms: ubuntu-16.04
@@ -90,6 +93,8 @@
         templates: devstack-pre-pip-newton
       - platforms: ubuntu-16.04
         templates: devstack-pre-pip-ocata
+      - platforms: ubuntu-16.04
+        templates: devstack-pre-pip-pike
       - platforms: ubuntu-16.04
         templates: devstack
       - platforms: ubuntu-16.04