Merge "Migrate next to global-jjb Maven jobs"

[releng/builder.git] / jjb / spectrometer / spectrometer-jobs.yaml

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 3557e498fdd50b087069d7ed5d0ad5abe9042368..752779e5f769450783d35bd0fd5b13b4fb4c3cdb 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -2,21 +2,22 @@
 - project:
     name: spectrometer
     jobs:
-      - '{project-name}-merge-rtd-{stream}'
-      - '{project-name}-verify-node-{stream}'
-      - '{project-name}-verify-python-{stream}'
-      - 'spectrometer-deploy-webapp-master'
+      - '{project-name}-node-jobs'
+      - '{project-name}-python-jobs'
+      - '{project-name}-rtd-jobs':
+          project-pattern: spectrometer
+      - spectrometer-deploy-webapp-master
 
     stream:
       - master:
           branch: 'master'
 
-    project: 'spectrometer'
-    project-name: 'spectrometer'
-    rtdproject: 'opendaylight-spectrometer'
-    toxdir: server
-    nodedir: web
-    nodever: 6.9.4
+    project: spectrometer
+    project-name: spectrometer
+    rtd-project: opendaylight-spectrometer
+    tox-dir: server
+    node-dir: web
+    node-version: 6.11.4
     staging-server: spectrometer03.dfw.opendaylight.org
 
 - job-template:
@@ -73,14 +74,15 @@
           $PYTHON -m pip install --upgrade -r spectrometer/server/requirements.txt
           $PYTHON -m pip install --upgrade gunicorn gevent
           $PYTHON -m pip install --upgrade nodeenv
-          $PYTHON -m pip freeze
+          $PYTHON -m pip install --upgrade pipdeptree
+          pipdeptree
 
           echo "---> Setup NodeJS"
           if [ -e venv-nodejs/bin/activate ]; then
               echo "---> Updating NodeJS dependencies"
           else
               echo "---> nodeenv not found. Setting up new nodeenv"
-              nodeenv --node={nodever} --prebuilt venv-nodejs
+              nodeenv --node={node-version} --prebuilt venv-nodejs
           fi
           source venv-nodejs/bin/activate
           node -v