Switch OVSDB back to using standard templates

Change-Id: I3e7461962ed2dd591ef4de8e29c15f100dc91efd
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/ovsdb/ovsdb.cfg b/jjb/ovsdb/ovsdb.cfg
index 8bc5704af40f0719988f3f782844b1326180573b..000f653bb1b0ac20b9532f334b1ace7101445863 100644 (file)
--- a/jjb/ovsdb/ovsdb.cfg
+++ b/jjb/ovsdb/ovsdb.cfg
@@ -1 +1,2 @@
 DEPENDENCIES: odlparent,controller,yangtools,openflowplugin
+JOB_TEMPLATES: verify,merge,daily,integration
\ No newline at end of file

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 69dd00bf3ff45fa8798deab22bc328fb000cdbc0..90b5af14de8f1b7110f26ff5612a163ea41a72ef 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,3 +1,7 @@
+# REMOVE THIS LINE IF YOU WANT TO CUSTOMIZE ANYTHING BELOW
+# Otherwise this file will be automatically overwritten by the template
+# autobuilder.
+
 # ODL Releng build templates
 - project:
     name: ovsdb
@@ -7,6 +11,7 @@
         - 'ovsdb-daily-{stream}'
         - 'ovsdb-integration-{stream}'
 
+
     # stream:    branch with - in place of / (eg. stable-helium)
     # branch:    branch (eg. stable/helium)
     stream: