Update spectrometer jobs

- Add spectrometer-merge job
- Use the global verify-python template for verify job

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

diff --git a/jjb/spectrometer/spectrometer-python.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
similarity index 74%
rename from jjb/spectrometer/spectrometer-python.yaml
rename to jjb/spectrometer/spectrometer-jobs.yaml
index ac9c06558a4922bb76df1f94b3170ae6c11b8f50..b5b1d8697dc0af746a8236898533ecd4a87082d9 100644 (file)
--- a/jjb/spectrometer/spectrometer-python.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -1,16 +1,18 @@
 - project:
-    name: spectrometer-python
+    name: spectrometer
     jobs:
-        - 'spectrometer-verify-python-{stream}'
+        - 'spectrometer-merge-{stream}'
+        - '{name}-verify-python-{stream}'
 
     stream:
         - master:
             branch: 'master'
 
     project: 'spectrometer'
+    toxdir: server
 
 - job-template:
-    name: 'spectrometer-verify-python-{stream}'
+    name: 'spectrometer-merge-{stream}'
 
     project-type: freestyle
     node: dynamic_verify
@@ -21,6 +23,8 @@
             project: '{project}'
         - gerrit-parameter:
             branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -44,9 +48,7 @@
                     exclude-no-code-change: 'false'
                 - draft-published-event
                 - comment-added-contains-event:
-                    comment-contains-value: 'recheck'
-                - comment-added-contains-event:
-                    comment-contains-value: 'reverify'
+                    comment-contains-value: 'remerge'
             projects:
               - project-compare-type: 'ANT'
                 project-pattern: 'spectrometer'
@@ -56,12 +58,7 @@
 
     builders:
         - shell: |
-            virtualenv $WORKSPACE/venv-tox
-            source $WORKSPACE/venv-tox/bin/activate
-            pip install tox argparse
-            tox --version
-            cd server
-            tox
+            wget --post-data=test -qO- https://readthedocs.org/build/opendaylight-spectrometer &> /dev/null
 
     publishers:
         - email-notification: