Merge "pin jobs to specific devstack flavored vms based on openstack version"

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

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 6894c7a53a71a1feb4b79fbc5b12822fa843f9ba..ae66accb78f1ac0d5de2d9d55b3dd7fba463840c 100644 (file)
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -25,9 +25,9 @@
     node: dynamic_verify
     concurrent: false
 
-    logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+    properties:
+        - opendaylight-infra-properties:
+            build-days-to-keep: '{build-days-to-keep}'
 
     wrappers:
         - build-timeout
@@ -37,6 +37,7 @@
 
     triggers:
         - gerrit-trigger-patch-merged:
+            server-name: '{server-name}'
             name: 'spectrometer'
             branch: 'master'
 
@@ -78,21 +79,11 @@
             node -v
             npm -v
 
-            echo "---> Ensure mongo is running"
-            ps -A | grep -q '[m]ongod'
-            if [ ! "$?" -eq "0" ]; then
-                echo "The mongod server DOWN", restarting...
-                if [ ! -d mongo ]; then
-                    mkdir mongo
-                fi
-                echo "---> Starting mongo"
-                mongod --dbpath ~/mongo &
-            fi
-
             echo "---> Restart spectrometer-api"
             pkill gunicorn
             sleep 5  # Sleep 5 seconds for cooldown
             nohup gunicorn -b 0.0.0.0:5000 'spectrometer:run_app()' --timeout 600 -k gevent >> ~/gunicorn.out &
+            sleep 120  # Sleep 2 minutes to allow Spectrometer to initialize
 
             echo "---> Restart spectrometer-web"
             pkill node