Merge "Add CONTRIBUTING file"

diff --git a/jjb/ovsdb/ovsdb-openstack-tempest.yaml b/jjb/ovsdb/ovsdb-openstack-tempest.yaml
index 89036b85c1485da151800ae7f6fc30c96bc95102..c372c5beb7e29da3c44e69d6cf210c2fee6d7162 100644 (file)
--- 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 08acf6eeb53427b4801ac7031c25da828950379f..e26c28a0c33b07a4dc7cbddd37c730a388f9e1a9 100644 (file)
--- 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 39a5d74288196addd1ac315add6987833324214c..ba0414062d8cac0b4994a448e0410e4bcaed0f82 100644 (file)
--- 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