From 0fbafe89393f84e55219e51900bdacbe9ed52835 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 18:13:55 +0800 Subject: [PATCH 01/45] added Jenkinsfile --- Jenkinsfile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..476b3c7c --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,21 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + echo 'Building..' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} \ No newline at end of file From 2a7ed719a3285be8216c4b08880ea0e6adefdb6f Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 18:21:15 +0800 Subject: [PATCH 02/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 476b3c7c..9dad5c44 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stages { stage('Build') { steps { - echo 'Building..' + echo "Git branch: ${env.GIT_BRANCH}" } } stage('Test') { From 6fb75bf189e3fb103b91ecf72b5e51d6478c7c7f Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 18:26:08 +0800 Subject: [PATCH 03/45] updated Jenkinsfile --- Jenkinsfile | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9dad5c44..8e9d4f48 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,9 +2,20 @@ pipeline { agent any stages { - stage('Build') { + stage('Build Frontend') { steps { - echo "Git branch: ${env.GIT_BRANCH}" + echo "Building frontend..." + sh "cd frontend" + sh "yarn install" + sh "npm run build:prod" + } + } + stage('Build Backend') { + steps { + echo "Building backend..." + sh "cd ../crawlab" + sh "pyenv activate crawlab" + sh "pip install -r requirements.txt" } } stage('Test') { From 5b08fd1e2a506f8e17e9820957174f39d3b0fbd3 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 18:34:34 +0800 Subject: [PATCH 04/45] updated Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 8e9d4f48..20576c50 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { steps { echo "Building frontend..." sh "cd frontend" + sh "npm install -g yarn pm2" sh "yarn install" sh "npm run build:prod" } From cfd8b5c585cef0ab053b7835922dbf9620bcef45 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 18:57:27 +0800 Subject: [PATCH 05/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 20576c50..3e12162c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent any + agent crawlab stages { stage('Build Frontend') { From b7268fda6243a063ced02adc9019784fb8213f25 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 18:59:59 +0800 Subject: [PATCH 06/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e12162c..bdd0d92a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ pipeline { - agent crawlab + agent {crawlab} stages { stage('Build Frontend') { From 7b7f1449689d4f43e0c281e2ce587dba4aba0e9e Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:11:08 +0800 Subject: [PATCH 07/45] updated Jenkinsfile --- Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index bdd0d92a..0f05e68d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,9 @@ pipeline { - agent {crawlab} + agent { + node { + label 'crawlab' + } + } stages { stage('Build Frontend') { From 57b05e3dfeaf0f533c9555e53dab6b743917f8e9 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:18:52 +0800 Subject: [PATCH 08/45] updated Jenkinsfile --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0f05e68d..1b2d4c46 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,9 +10,8 @@ pipeline { steps { echo "Building frontend..." sh "cd frontend" - sh "npm install -g yarn pm2" - sh "yarn install" - sh "npm run build:prod" + sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/yarn install" + sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" } } stage('Build Backend') { From ca3c2ddae986f8bdbf25476bd2b4ebbba1976da0 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:20:05 +0800 Subject: [PATCH 09/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1b2d4c46..ce458f63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { steps { echo "Building frontend..." sh "cd frontend" - sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/yarn install" + sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" } } From dbef1a45bada20b7a450ac2499383b35b1396050 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:22:17 +0800 Subject: [PATCH 10/45] updated Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce458f63..ac4c2f79 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,8 +10,8 @@ pipeline { steps { echo "Building frontend..." sh "cd frontend" - sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" - sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" + sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" + sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" } } stage('Build Backend') { From ba39f45d3ff1388dcef1c2f5eee7ba0ae98fc55e Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:23:35 +0800 Subject: [PATCH 11/45] updated Jenkinsfile --- Jenkinsfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ac4c2f79..e2fab2a5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,12 +6,20 @@ pipeline { } stages { + stage('Setup') { + steps { + "Running Setup..." + sh 'source /home/yeqing/.profile' + } + } stage('Build Frontend') { steps { echo "Building frontend..." sh "cd frontend" - sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" - sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" + sh "yarn install" + sh "npm run build:prod" + sh "#/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" + sh "#/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" } } stage('Build Backend') { From 4ae985525e8ba7f2c39d2231a74bed786b1da902 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:24:22 +0800 Subject: [PATCH 12/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2fab2a5..e2eb374a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stages { stage('Setup') { steps { - "Running Setup..." + echo "Running Setup..." sh 'source /home/yeqing/.profile' } } From 9b685fc4ce10070e1d863ddba5d150d4dbff9034 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:27:12 +0800 Subject: [PATCH 13/45] fixed localhost issue --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e2eb374a..f06dba9c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,17 +9,17 @@ pipeline { stage('Setup') { steps { echo "Running Setup..." - sh 'source /home/yeqing/.profile' + sh '#source /home/yeqing/.profile' } } stage('Build Frontend') { steps { echo "Building frontend..." sh "cd frontend" - sh "yarn install" - sh "npm run build:prod" - sh "#/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" - sh "#/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" + sh "#yarn install" + sh "#npm run build:prod" + sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" + sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" } } stage('Build Backend') { From c34cd0743636f1a0068e98d4706c1f80fdd6ed15 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:32:35 +0800 Subject: [PATCH 14/45] updated Jenkinsfile --- Jenkinsfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f06dba9c..246f17d1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,10 +5,16 @@ pipeline { } } + environment { + NODE_HOME = '/home/yeqing/.nvm/versions/node/v8.12.0' + ROOT_DIR = "/home/yeqing/jenkins_home/workspace/crawlab_${GIT_BRANCH}" + } + stages { stage('Setup') { steps { echo "Running Setup..." + sh '#source /home/yeqing/.profile' } } @@ -16,10 +22,8 @@ pipeline { steps { echo "Building frontend..." sh "cd frontend" - sh "#yarn install" - sh "#npm run build:prod" - sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm install" - sh "/home/yeqing/.nvm/versions/node/v8.12.0/bin/node /home/yeqing/.nvm/versions/node/v8.12.0/bin/npm run build:prod" + sh "cd ${NODE_HOME}/node ${NODE_HOME}/bin/npm install" + sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" } } stage('Build Backend') { From 3cf3999f52ab640c0e59ae11911cea17e847c81c Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:33:54 +0800 Subject: [PATCH 15/45] updated Jenkinsfile --- Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 246f17d1..7509ddd8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,9 +21,8 @@ pipeline { stage('Build Frontend') { steps { echo "Building frontend..." - sh "cd frontend" - sh "cd ${NODE_HOME}/node ${NODE_HOME}/bin/npm install" - sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/node ${NODE_HOME}/bin/npm install" + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" } } stage('Build Backend') { From 6058999edcd2079fd298f1816692d1f14367183b Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:35:39 +0800 Subject: [PATCH 16/45] updated Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7509ddd8..88bfeedd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,8 +21,8 @@ pipeline { stage('Build Frontend') { steps { echo "Building frontend..." - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/node ${NODE_HOME}/bin/npm install" - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" + sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm install" + sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" } } stage('Build Backend') { From 270ce4f248ba5dc06d7d509225aee054909bdccd Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:37:59 +0800 Subject: [PATCH 17/45] updated Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 88bfeedd..285bd318 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,8 @@ pipeline { stage('Build Frontend') { steps { echo "Building frontend..." - sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm install" + sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm install -g yarn pm2 --registry=http://npm.taobao.org/mirrors" + sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/yarn install --registry=http://npm.taobao.org/mirrors" sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" } } From 8e0b4c4b4752082dca29db33bf6014ba0a259800 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:39:39 +0800 Subject: [PATCH 18/45] updated Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 285bd318..9f8adf1c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,8 +21,8 @@ pipeline { stage('Build Frontend') { steps { echo "Building frontend..." - sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm install -g yarn pm2 --registry=http://npm.taobao.org/mirrors" - sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/yarn install --registry=http://npm.taobao.org/mirrors" + 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/" sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" } } From 4f94ae95b479b4c9e2976f806cfc45b25f1c6149 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:55:52 +0800 Subject: [PATCH 19/45] updated Jenkinsfile --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9f8adf1c..3e8d63a9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,6 +8,7 @@ pipeline { environment { NODE_HOME = '/home/yeqing/.nvm/versions/node/v8.12.0' ROOT_DIR = "/home/yeqing/jenkins_home/workspace/crawlab_${GIT_BRANCH}" + PYTHON_HOME = '/home/yeqing/.pyenv/shims' } stages { @@ -23,15 +24,13 @@ 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/" - sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm run build:prod" + sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${ROOT_DIR}/frontend/node_modules/.bin/vue-cli-service build --mode=production" } } stage('Build Backend') { steps { echo "Building backend..." - sh "cd ../crawlab" - sh "pyenv activate crawlab" - sh "pip install -r requirements.txt" + sh "${PYTHON_HOME}/pip install -r ${ROOT_DIR}/crawlab/requirements.txt" } } stage('Test') { From af3d9e2d8ad0ff587e43b918602ea8b1813dc1a6 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 19:57:49 +0800 Subject: [PATCH 20/45] updated Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e8d63a9..2b87ceb7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,8 @@ pipeline { stage('Build Frontend') { steps { 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/" + 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/npm install --registry=http://registry.npm.taobao.org/" sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${ROOT_DIR}/frontend/node_modules/.bin/vue-cli-service build --mode=production" } } From 6981e55aea90cd85916f5e12672461c8dbf5296e Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:03:05 +0800 Subject: [PATCH 21/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2b87ceb7..7c647019 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { steps { 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/npm install --registry=http://registry.npm.taobao.org/" + sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm 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" } } From 70a78f1051cf4340795601dd442d639325c86c78 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:04:54 +0800 Subject: [PATCH 22/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7c647019..4a2e4e99 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { steps { 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/npm install --registry=http://registry.npm.taobao.org/ --scripts-prepend-node-path=${NODE_HOME}/bin/node" + sh "#cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm 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" } } From ed85ed80dcec25d8352c75a90cd92d88c8336b44 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:15:58 +0800 Subject: [PATCH 23/45] updated Jenkinsfile --- Jenkinsfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4a2e4e99..baca2877 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,14 +23,14 @@ pipeline { steps { 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/npm install --registry=http://registry.npm.taobao.org/ --scripts-prepend-node-path=${NODE_HOME}/bin/node" + sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${NODE_HOME}/bin/npm 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" } } stage('Build Backend') { steps { echo "Building backend..." - sh "${PYTHON_HOME}/pip install -r ${ROOT_DIR}/crawlab/requirements.txt" + sh "${PYTHON_HOME}/pip install -r ${ROOT_DIR}/crawlab/requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple" } } stage('Test') { @@ -41,6 +41,9 @@ pipeline { stage('Deploy') { steps { echo 'Deploying....' + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/pm2 start app.py" + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/pm2 start ./bin/run_flower.py" + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/pm2 start ./bin/run_worker.py" } } } From c26783796c93dd04957cb6002b4b2f472d80f729 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:18:12 +0800 Subject: [PATCH 24/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index baca2877..0976952e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { steps { 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/npm install --registry=http://registry.npm.taobao.org/ --scripts-prepend-node-path=${NODE_HOME}/bin/node" + 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 "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${ROOT_DIR}/frontend/node_modules/.bin/vue-cli-service build --mode=production" } } From d6ecd9263919906325e3c8b72fa5777e667e9b78 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:30:57 +0800 Subject: [PATCH 25/45] updated Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0976952e..ea96c829 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,9 +41,9 @@ pipeline { stage('Deploy') { steps { echo 'Deploying....' - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/pm2 start app.py" - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/pm2 start ./bin/run_flower.py" - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/pm2 start ./bin/run_worker.py" + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/pm2 start app.py" + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/pm2 start ./bin/run_flower.py" + sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/pm2 start ./bin/run_worker.py" } } } From e0ee64f4c53c836af715b25f2fbec2f3574f76bf Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:32:51 +0800 Subject: [PATCH 26/45] updated Jenkinsfile --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea96c829..20cdd16c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,9 +41,9 @@ pipeline { stage('Deploy') { steps { echo 'Deploying....' - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/pm2 start app.py" - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/pm2 start ./bin/run_flower.py" - sh "cd ${ROOT_DIR}/crawlab && ${NODE_HOME}/bin/pm2 start ./bin/run_worker.py" + 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" } } } From cbd10859ce67dad4b37804c1cc0d2e24c798e944 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:44:56 +0800 Subject: [PATCH 27/45] updated Jenkinsfile --- Jenkinsfile | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 20cdd16c..3e99888e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,6 +6,7 @@ pipeline { } environment { + HOME = '/home/yeqing' NODE_HOME = '/home/yeqing/.nvm/versions/node/v8.12.0' ROOT_DIR = "/home/yeqing/jenkins_home/workspace/crawlab_${GIT_BRANCH}" PYTHON_HOME = '/home/yeqing/.pyenv/shims' @@ -16,6 +17,11 @@ pipeline { steps { echo "Running Setup..." + sh ". ${HOME}/.nvm/nvm.sh" + sh "nvm use 8.12" + + sh "${HOME}/.pyenv/bin/pyenv activate crawlab" + sh '#source /home/yeqing/.profile' } } @@ -23,7 +29,9 @@ pipeline { steps { 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 "#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 "#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" } } From 35377ece93ddbf336a3dacfe8de978fb87d29180 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Fri, 31 May 2019 20:49:17 +0800 Subject: [PATCH 28/45] updated Jenkinsfile --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3e99888e..eaae544d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,10 +17,11 @@ pipeline { steps { echo "Running Setup..." - sh ". ${HOME}/.nvm/nvm.sh" - sh "nvm use 8.12" + sh 'source ~/.bashrc' + // sh ". ${HOME}/.nvm/nvm.sh" + // sh "nvm use 8.12" - sh "${HOME}/.pyenv/bin/pyenv activate crawlab" + // sh "${HOME}/.pyenv/bin/pyenv activate crawlab" sh '#source /home/yeqing/.profile' } From 5989ae1926aa61f1f1a7c2b1a748aadd2a1d4cb3 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 14:19:56 +0800 Subject: [PATCH 29/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index eaae544d..3cff7c48 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { steps { echo "Running Setup..." - sh 'source ~/.bashrc' + sh '. ~/.bashrc' // sh ". ${HOME}/.nvm/nvm.sh" // sh "nvm use 8.12" From ddcac393b64d2dd07094987d5d4f727857bbc88d Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 14:23:49 +0800 Subject: [PATCH 30/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3cff7c48..e8f61ee9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { steps { echo "Running Setup..." - sh '. ~/.bashrc' + sh '. ~/.profile' // sh ". ${HOME}/.nvm/nvm.sh" // sh "nvm use 8.12" From 9d95154509536350b5a87e9ed113ea9c7f76339c Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 14:25:12 +0800 Subject: [PATCH 31/45] updated Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e8f61ee9..10697538 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,11 +17,11 @@ pipeline { steps { echo "Running Setup..." - sh '. ~/.profile' + // sh '. ~/.profile' // sh ". ${HOME}/.nvm/nvm.sh" // sh "nvm use 8.12" - // sh "${HOME}/.pyenv/bin/pyenv activate crawlab" + sh "${HOME}/.pyenv/bin/pyenv activate crawlab" sh '#source /home/yeqing/.profile' } From 47b5ead5bdf5b796c1b607069db808e3a16238b1 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 14:25:42 +0800 Subject: [PATCH 32/45] updated Jenkinsfile --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10697538..ca89d04d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,10 +29,9 @@ pipeline { stage('Build Frontend') { steps { 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 "#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 "${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" } } From d127a39607905763b0f5deb053ab4b70eaa40a67 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 14:37:44 +0800 Subject: [PATCH 33/45] 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" + } } } } From 8b23a9c8935203f4f99555c403439a4f918e9e96 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 14:52:40 +0800 Subject: [PATCH 34/45] updated Jenkinsfile --- Jenkinsfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 08aa4985..8ff572d3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -41,11 +41,9 @@ pipeline { stage('Deploy') { steps { echo 'Deploying....' - 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" - } + sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart app" + sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart run_flower" + sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart run_worker" } } } From 91809b0e34f1126867aefe89a744462ea5742004 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:03:01 +0800 Subject: [PATCH 35/45] updated Jenkinsfile --- Jenkinsfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8ff572d3..44471853 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -16,7 +16,7 @@ pipeline { stage('Setup') { steps { echo "Running Setup..." - sh '. /home/yeqing/.profile' + // sh '. /home/yeqing/.profile' } } stage('Build Frontend') { @@ -41,6 +41,7 @@ pipeline { stage('Deploy') { steps { echo 'Deploying....' + sh "cp -r ${ROOT_DIR}/frontend/dist /var/html/dev.crawlab.cn" sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart app" sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart run_flower" sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart run_worker" From 02c8909a3db52f36433d29d55170cdbbc501b406 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:07:46 +0800 Subject: [PATCH 36/45] updated .env.production --- frontend/.env.production | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/.env.production b/frontend/.env.production index 7578e882..58fe7f33 100644 --- a/frontend/.env.production +++ b/frontend/.env.production @@ -1,2 +1,2 @@ NODE_ENV='production' -VUE_APP_BASE_URL='http://crawlab.cn:8000/api' +VUE_APP_BASE_URL='http://114.67.75.98:8000/api' From 54ed076efe678046565464bb36779e6465b54014 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:11:30 +0800 Subject: [PATCH 37/45] updated Jenkinsfile --- Jenkinsfile | 10 ++++++++-- frontend/.env.test | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 frontend/.env.test diff --git a/Jenkinsfile b/Jenkinsfile index 44471853..4c135f77 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,13 @@ pipeline { steps { echo "Running Setup..." // sh '. /home/yeqing/.profile' + if (env.GIT_BRANCH == 'develop') { + MODE = 'test' + } else if (env.GIT_BRANCH == 'master') { + MODE = 'production' + } else { + MODE = 'test' + } } } stage('Build Frontend') { @@ -24,7 +31,7 @@ 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 "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${ROOT_DIR}/frontend/node_modules/.bin/vue-cli-service build --mode=production" + sh "cd ${ROOT_DIR}/frontend && ${NODE_HOME}/bin/node ${ROOT_DIR}/frontend/node_modules/.bin/vue-cli-service build --mode=${MODE}" } } stage('Build Backend') { @@ -41,7 +48,6 @@ pipeline { stage('Deploy') { steps { echo 'Deploying....' - sh "cp -r ${ROOT_DIR}/frontend/dist /var/html/dev.crawlab.cn" sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart app" sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart run_flower" sh "${NODE_HOME}/bin/node ${NODE_HOME}/bin/pm2 restart run_worker" diff --git a/frontend/.env.test b/frontend/.env.test new file mode 100644 index 00000000..acff44de --- /dev/null +++ b/frontend/.env.test @@ -0,0 +1,2 @@ +NODE_ENV='test' +VUE_APP_BASE_URL='http://114.67.75.98:8000/api' From 77e85c88c5995b8ea96b4c014d1293588a06f53c Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:20:36 +0800 Subject: [PATCH 38/45] updated Jenkinsfile --- .gitignore | 3 +++ Jenkinsfile | 18 ++++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index c366ea24..622a9c22 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,6 @@ node_modules/ # .DS_Store .DS_Store + +.docks +.docs \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 4c135f77..75f2da76 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,16 +14,14 @@ pipeline { stages { stage('Setup') { - steps { - echo "Running Setup..." - // sh '. /home/yeqing/.profile' - if (env.GIT_BRANCH == 'develop') { - MODE = 'test' - } else if (env.GIT_BRANCH == 'master') { - MODE = 'production' - } else { - MODE = 'test' - } + echo "Running Setup..." + // sh '. /home/yeqing/.profile' + if (env.GIT_BRANCH == 'develop') { + MODE = 'test' + } else if (env.GIT_BRANCH == 'master') { + MODE = 'production' + } else { + MODE = 'test' } } stage('Build Frontend') { From 0251ab7aa6959436e5b286eb342df9c3908116d0 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:22:08 +0800 Subject: [PATCH 39/45] code cleanup --- crawlab/bin/run_app.py | 17 ----------------- crawlab/bin/start_flower.sh | 2 -- 2 files changed, 19 deletions(-) delete mode 100644 crawlab/bin/run_app.py delete mode 100755 crawlab/bin/start_flower.sh diff --git a/crawlab/bin/run_app.py b/crawlab/bin/run_app.py deleted file mode 100644 index 999d7278..00000000 --- a/crawlab/bin/run_app.py +++ /dev/null @@ -1,17 +0,0 @@ -import sys -import os - -# make sure the working directory is in system path -file_dir = os.path.dirname(os.path.realpath(__file__)) -root_path = os.path.abspath(os.path.join(file_dir, '..')) -sys.path.append(root_path) - -from config import PROJECT_LOGS_FOLDER, FLASK_HOST, FLASK_PORT -from manage import app - -# create folder if it does not exist -if not os.path.exists(PROJECT_LOGS_FOLDER): - os.makedirs(PROJECT_LOGS_FOLDER) - -# run app instance -app.run(host=FLASK_HOST, port=FLASK_PORT) diff --git a/crawlab/bin/start_flower.sh b/crawlab/bin/start_flower.sh deleted file mode 100755 index 98339f7d..00000000 --- a/crawlab/bin/start_flower.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env bash -celery flower --broker=mongodb://localhost:27017 From fcbce534cb2ddd28223615e3b922abc77f878572 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:23:54 +0800 Subject: [PATCH 40/45] updated Jenkinsfile --- Jenkinsfile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 75f2da76..90f18e62 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,14 +14,16 @@ pipeline { stages { stage('Setup') { - echo "Running Setup..." - // sh '. /home/yeqing/.profile' - if (env.GIT_BRANCH == 'develop') { - MODE = 'test' - } else if (env.GIT_BRANCH == 'master') { - MODE = 'production' - } else { - MODE = 'test' + step { + echo "Running Setup..." + // sh '. /home/yeqing/.profile' + if (env.GIT_BRANCH == 'develop') { + MODE = 'test' + } else if (env.GIT_BRANCH == 'master') { + MODE = 'production' + } else { + MODE = 'test' + } } } stage('Build Frontend') { From 6f3f26dd7a72e758b7a30cb159f585e2215b2b5f Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:24:38 +0800 Subject: [PATCH 41/45] updated Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 90f18e62..4c135f77 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -14,7 +14,7 @@ pipeline { stages { stage('Setup') { - step { + steps { echo "Running Setup..." // sh '. /home/yeqing/.profile' if (env.GIT_BRANCH == 'develop') { From cd7ec90ac55aa46a6b684552d5d9e6b12cd13bc4 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:25:01 +0800 Subject: [PATCH 42/45] updated Jenkinsfile --- Jenkinsfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4c135f77..4207bc74 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,6 +10,14 @@ pipeline { NODE_HOME = '/home/yeqing/.nvm/versions/node/v8.12.0' ROOT_DIR = "/home/yeqing/jenkins_home/workspace/crawlab_${GIT_BRANCH}" PYTHON_HOME = '/home/yeqing/.pyenv/shims' + + if (env.GIT_BRANCH == 'develop') { + MODE = 'test' + } else if (env.GIT_BRANCH == 'master') { + MODE = 'production' + } else { + MODE = 'test' + } } stages { @@ -17,13 +25,6 @@ pipeline { steps { echo "Running Setup..." // sh '. /home/yeqing/.profile' - if (env.GIT_BRANCH == 'develop') { - MODE = 'test' - } else if (env.GIT_BRANCH == 'master') { - MODE = 'production' - } else { - MODE = 'test' - } } } stage('Build Frontend') { From 45fd890dc551c1f4f5d72113271b3cbdd6141bed Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:26:09 +0800 Subject: [PATCH 43/45] updated Jenkinsfile --- Jenkinsfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4207bc74..5ca0b085 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,14 +10,6 @@ pipeline { NODE_HOME = '/home/yeqing/.nvm/versions/node/v8.12.0' ROOT_DIR = "/home/yeqing/jenkins_home/workspace/crawlab_${GIT_BRANCH}" PYTHON_HOME = '/home/yeqing/.pyenv/shims' - - if (env.GIT_BRANCH == 'develop') { - MODE = 'test' - } else if (env.GIT_BRANCH == 'master') { - MODE = 'production' - } else { - MODE = 'test' - } } stages { @@ -25,6 +17,15 @@ pipeline { steps { echo "Running Setup..." // sh '. /home/yeqing/.profile' + script { + if (env.GIT_BRANCH == 'develop') { + env.MODE = 'test' + } else if (env.GIT_BRANCH == 'master') { + env.MODE = 'production' + } else { + env.MODE = 'test' + } + } } } stage('Build Frontend') { From beb8783adc18821a71b3d673bd73923d1b29eb06 Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:37:34 +0800 Subject: [PATCH 44/45] updated README. added jenkins build status --- README-zh.md | 2 ++ README.md | 1 + 2 files changed, 3 insertions(+) diff --git a/README-zh.md b/README-zh.md index 36e9d82d..4432a1f0 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,6 +1,8 @@ # Crawlab +![](http://114.67.75.98:8081/job/crawlab/job/develop/badge/icon) ![](https://img.shields.io/badge/版本-v0.2.1-blue.svg) + diff --git a/README.md b/README.md index 2914ffa2..bfa4065a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # Crawlab +![](http://114.67.75.98:8081/job/crawlab/job/develop/badge/icon) ![](https://img.shields.io/badge/version-v0.2.1-blue.svg) From f2bba05421412e1b0f0883417f2b613f7ac1df1b Mon Sep 17 00:00:00 2001 From: Marvin Zhang Date: Sat, 1 Jun 2019 15:42:16 +0800 Subject: [PATCH 45/45] updated README. added jenkins build status --- README-zh.md | 3 +-- README.md | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README-zh.md b/README-zh.md index 4432a1f0..88d83abc 100644 --- a/README-zh.md +++ b/README-zh.md @@ -1,8 +1,7 @@ # Crawlab -![](http://114.67.75.98:8081/job/crawlab/job/develop/badge/icon) +![](http://114.67.75.98:8081/buildStatus/icon?job=crawlab%2Fdevelop) ![](https://img.shields.io/badge/版本-v0.2.1-blue.svg) - diff --git a/README.md b/README.md index bfa4065a..9bffb6ed 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # Crawlab -![](http://114.67.75.98:8081/job/crawlab/job/develop/badge/icon) +![](http://114.67.75.98:8081/buildStatus/icon?job=crawlab%2Fdevelop) ![](https://img.shields.io/badge/version-v0.2.1-blue.svg) - + [中文](https://github.com/tikazyq/crawlab/blob/master/README-zh.md) | English