run-jjb.py: fix job update and filter out lava definitions

* pass the generated template instead of the original job configuration
* process only the yaml files in the top directory
  (filter out lava job defintions)

Change-Id: I5f2ec75745d95667e8cebe4dc17f85ade1ae860d
Reported-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/run-jjb.py b/run-jjb.py
index 8ecc3049c4..904aa6cb3d 100755
--- a/run-jjb.py
+++ b/run-jjb.py
@@ -27,7 +27,7 @@ if proc.returncode != 0:
     raise ValueError("command has failed with code '%s'" % proc.returncode)
 
 for conf_filename in data.splitlines():
-    if conf_filename.endswith('.yaml'):
+    if conf_filename.endswith('.yaml') and '/' not in conf_filename:
         with open(conf_filename) as f:
             buffer = f.read()
             template = string.Template(buffer)
@@ -40,7 +40,7 @@ for conf_filename in data.splitlines():
         with open('template.yaml', 'w') as f:
             f.write(buffer)
         try:
-            arguments = [jjb_cmd, 'update', conf_filename]
+            arguments = [jjb_cmd, 'update', 'template.yaml']
             # arguments = [jjb_cmd, 'test', conf_filename, '-o', 'out']
             proc = subprocess.Popen(arguments,
                                     stdin=subprocess.PIPE,