From d127a39607905763b0f5deb053ab4b70eaa40a67 Mon Sep 17 00:00:00 2001
From: Marvin Zhang <tikazyq@gmail.com>
Date: Sat, 1 Jun 2019 14:37:44 +0800
Subject: [PATCH] updated Jenkinsfile

---
 Jenkinsfile | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index ca89d04d..08aa4985 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -16,14 +16,7 @@ pipeline {
         stage('Setup') {
             steps {
                 echo "Running Setup..."
-
-                // sh '. ~/.profile'
-                // sh ". ${HOME}/.nvm/nvm.sh"
-                // sh "nvm use 8.12"
-
-                sh "${HOME}/.pyenv/bin/pyenv activate crawlab"
-
-                sh '#source /home/yeqing/.profile'
+                sh '. /home/yeqing/.profile'
             }
         }
         stage('Build Frontend') {
@@ -31,7 +24,6 @@ pipeline {
                 echo "Building frontend..."
                 // sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm install -g yarn pm2 --registry=http://registry.npm.taobao.org/"
                 sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/yarn install --registry=http://registry.npm.taobao.org/ --scripts-prepend-node-path=${NODE_HOME}/bin/node"
-                // sh "yarn install --registry=http://registry.npm.taobao.org/ --scripts-prepend-node-path=${NODE_HOME}/bin/node"
                 sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${ROOT_DIR}/frontend/node_modules/.bin/vue-cli-service build --mode=production"
             }
         }
@@ -49,9 +41,11 @@ pipeline {
         stage('Deploy') {
             steps {
                 echo 'Deploying....'
-                sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 start app.py"
-                sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 start ./bin/run_flower.py"
-                sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 start ./bin/run_worker.py"
+                withPythonEnv('crawlab') {
+                    sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 start app.py"
+                    sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 start ./bin/run_flower.py"
+                    sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 start ./bin/run_worker.py"
+                }
             }
         }
     }