From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Tue, 5 Jan 2016 14:34:46 +0000 (+0000)
Subject: Merge "Add CONTRIBUTING file"
X-Git-Tag: release/beryllium~216
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=a98d59f5e29a56a5270be6f0a764e6595557df34;hp=c0cf7a7fa0c234d35d5b0eeb1aa2aa1f312a0a36;p=releng%2Fbuilder.git

Merge "Add CONTRIBUTING file"
---

diff --git a/jjb/ovsdb/ovsdb-openstack-tempest.yaml b/jjb/ovsdb/ovsdb-openstack-tempest.yaml
index 89036b85c..c372c5beb 100644
--- a/jjb/ovsdb/ovsdb-openstack-tempest.yaml
+++ b/jjb/ovsdb/ovsdb-openstack-tempest.yaml
@@ -66,7 +66,8 @@
                   - '{ssh-credentials}'
 
     # Trigger jobs (daily)
-    schedule: 'H H * * *'
+    triggers:
+        - timed:  'H H * * *'
 
     builders:
         - integration-install-robotframework
diff --git a/jjb/ovsdb/ovsdb-verify-custom.yaml b/jjb/ovsdb/ovsdb-verify-custom.yaml
index 08acf6eeb..e26c28a0c 100644
--- a/jjb/ovsdb/ovsdb-verify-custom.yaml
+++ b/jjb/ovsdb/ovsdb-verify-custom.yaml
@@ -11,5 +11,10 @@
             jdk: openjdk8
             jdks:
                 - openjdk8
+        - clustering-netvirt-master:
+            branch: 'topic/master/net-virt-clustering'
+            jdk: openjdk7
+            jdks:
+                - openjdk7
 
     project: 'ovsdb'
diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 39a5d7428..ba0414062 100644
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -3,9 +3,6 @@ STREAMS:
     branch: master
     jdks: openjdk7,openjdk8
     autorelease: true
-- clustering-netvirt-master:
-    branch: topic/master/net-virt-clustering
-    jdks: openjdk7
 - pre-boron:
     branch: pre-boron
     jdks: openjdk7,openjdk8