X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fspectrometer%2Fspectrometer-jobs.yaml;h=a5532fbe7641520d7068f2ddd543e57c7de00a0b;hb=5e174f5369c8d24a081f37f8ea227c1fff8ebb0e;hp=6894c7a53a71a1feb4b79fbc5b12822fa843f9ba;hpb=bbf6d21d4bbe4ce8f9ed455b978d4b8dc3af303f;p=releng%2Fbuilder.git

diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml
index 6894c7a53..a5532fbe7 100644
--- a/jjb/spectrometer/spectrometer-jobs.yaml
+++ b/jjb/spectrometer/spectrometer-jobs.yaml
@@ -1,103 +1,99 @@
+---
 - 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}-merge-rtd-{stream}'
+      - '{project-name}-verify-node-{stream}'
+      - '{project-name}-verify-python-{stream}'
+      - 'spectrometer-deploy-webapp-master'
 
     stream:
-        - master:
-            branch: 'master'
+      - master:
+          branch: 'master'
 
     project: 'spectrometer'
     project-name: 'spectrometer'
     rtdproject: 'opendaylight-spectrometer'
     toxdir: server
     nodedir: web
-    nodever: 4.4.6
+    nodever: 6.9.4
     staging-server: spectrometer03.dfw.opendaylight.org
 
 - job-template:
     name: 'spectrometer-deploy-webapp-master'
 
     project-type: freestyle
-    node: dynamic_verify
+    node: centos7-java-builder-2c-4g
     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
-        - ssh-agent-credentials:
-            users:
-                - 'spectrometer-deploy-key'
+      - build-timeout
+      - ssh-agent-credentials:
+          users:
+            - 'spectrometer-deploy-key'
 
     triggers:
-        - gerrit-trigger-patch-merged:
-            name: 'spectrometer'
-            branch: 'master'
+      - gerrit-trigger-patch-merged:
+          server-name: '{server-name}'
+          name: 'spectrometer'
+          branch: 'master'
 
     builders:
-        - shell: |
-            echo "Deploying spectrometer"
-            ssh -oStrictHostKeyChecking=no spectrometer@{staging-server} 'bash -s' << EOF
+      - shell: |
+          echo "Deploying spectrometer"
+          ssh -oStrictHostKeyChecking=no spectrometer@{staging-server} 'bash -s' << EOF
 
-            if [ -e spectrometer ]; then
-                cd spectrometer
-                git pull
-                cd ..
-            else
-                git clone https://git.opendaylight.org/gerrit/spectrometer
-            fi
+          if [ -e spectrometer ]; then
+              cd spectrometer
+              git pull
+              cd ..
+          else
+              git clone https://git.opendaylight.org/gerrit/spectrometer
+          fi
 
-            echo "---> Setup Python"
-            if [ -e venv-python34/bin/activate ]; then
-                echo "---> Updating Python dependencies"
-            else
-                echo "---> virtualenv not found. Setting up new virtualenv."
-                pyvenv venv-python34
-                pip install -e spectrometer/server
-            fi
-            source venv-python34/bin/activate
-            pip install --upgrade -r spectrometer/server/requirements.txt
-            pip install --upgrade nodeenv
-            pip freeze
+          echo "---> Setup Python"
+          if [ -e venv-python34/bin/activate ]; then
+              echo "---> Updating Python dependencies"
+              source venv-python34/bin/activate
+          else
+              echo "---> virtualenv not found. Setting up new virtualenv."
+              pyvenv venv-python34 --without-pip
+              source venv-python34/bin/activate
+              wget https://bootstrap.pypa.io/get-pip.py
+              python get-pip.py
+              pip install -e spectrometer/server
+          fi
+          pip install --upgrade -r spectrometer/server/requirements.txt
+          pip install --upgrade gunicorn gevent
+          pip install --upgrade nodeenv
+          pip freeze
 
-            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
-            fi
-            source venv-nodejs/bin/activate
-            npm install -g spectrometer/web
-            node -v
-            npm -v
+          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
+          fi
+          source venv-nodejs/bin/activate
+          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-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 &
+          echo "---> Restart spectrometer-web"
+          pkill node
+          sleep 5  # Sleep 5 seconds for cooldown
+          cd spectrometer/web
+          npm install
+          nohup npm start >> ~/node.out &
 
-            echo "---> Restart spectrometer-web"
-            pkill node
-            sleep 5  # Sleep 5 seconds for cooldown
-            cd spectrometer/web
-            nohup npm start >> ~/node.out &
-
-            EOF
+          EOF