Commit 15ee785c authored by daidekun's avatar daidekun

fixbugs

parent ac920e55
......@@ -21,14 +21,14 @@ def prepare_nodejs(systemName, contextDir) {
sh "cp -rf /home/quant_group/config_repository/nodejs/${systemName}.js env.config.js"
}
def prepare_ui(systemName, contextDir) {
/*def prepare_ui(systemName, contextDir) {
sh "rm -rf ${contextDir}"
sh "cd /home/quant_group/qg-dockerfiles/templates/ui; git pull; cd -"
sh "cp -rf /home/quant_group/qg-dockerfiles/templates/ui ${contextDir}"
sh "cd /home/quant_group/config_repository/java; git pull; cd -"
sh "cp -rf /home/quant_group/config_repository/ui/${systemName}.js env.config.js"
}
}*/
def prepare_luaui(systemNames, contextDir) {
sh "rm -rf ${contextDir}"
......@@ -105,7 +105,7 @@ def jsonParse(def json) {
new groovy.json.JsonSlurperClassic().parseText(json)
}
def build_ui(namespace, systemName, contextDir, repoName, branchName, workspace) {
/*def build_ui(namespace, systemName, contextDir, repoName, branchName, workspace) {
response = httpRequest "http://192.168.4.3:10088/config_server/get_node_command/${systemName}"
def res_json = jsonParse(response.content)
......@@ -137,6 +137,7 @@ def build_ui(namespace, systemName, contextDir, repoName, branchName, workspace)
sh 'tar zcf dist.tgz dist/'
sh "mv dist.tgz ${contextDir}"
}
*/
def build_nodejs(namespace, systemName, contextDir, repoName, branchName, workspace) {
response = httpRequest "http://192.168.4.3:10088/config_server/get_node_command/${systemName}"
......@@ -186,13 +187,6 @@ def build_luaui(namespace, systemNames, contextDir, repoName, branchName, worksp
def bowerFile = fileExists './bower.json'
print "=========env info=========="
sh '''#!/bin/bash
ruby -v
pwd
ls
'''
if (bowerFile) {
sh "bower install"
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment