Commit bc4c3c88 authored by daidekun's avatar daidekun

改回来

parent fafc1085
...@@ -16,6 +16,10 @@ def prepare_nodejs(systemName, contextDir) { ...@@ -16,6 +16,10 @@ def prepare_nodejs(systemName, contextDir) {
sh "rm -rf ${contextDir}" sh "rm -rf ${contextDir}"
sh "cd /home/quant_group/qg-dockerfiles/templates/nodejs; git pull; cd -" sh "cd /home/quant_group/qg-dockerfiles/templates/nodejs; git pull; cd -"
sh "cp -rf /home/quant_group/qg-dockerfiles/templates/nodejs ${contextDir}" sh "cp -rf /home/quant_group/qg-dockerfiles/templates/nodejs ${contextDir}"
sh "cd /home/quant_group/config_repository/java; git pull; cd -"
sh "cp -rf /home/quant_group/config_repository/nodejs/${systemName}.js env.config.js"
sh "sed -i \"s/.xyqb.com/-${namespace}.q-gp.com/\" env.config.js"
} }
def prepare_ui(systemName, contextDir) { def prepare_ui(systemName, contextDir) {
...@@ -79,13 +83,15 @@ def build_nodejs_and_ui(namespace, systemName, contextDir, repoName, branchName, ...@@ -79,13 +83,15 @@ def build_nodejs_and_ui(namespace, systemName, contextDir, repoName, branchName,
def bowerFile = fileExists './bower.json' def bowerFile = fileExists './bower.json'
if (bowerFile) { sh buildCmd
sh 'tar zcf dist.tgz dist/'
sh "mv dist.tgz ${contextDir}"
/* if (bowerFile) {
sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e repo_name=${repoName} -e branch_name=${branchName} -e workspace=${workspace}/${contextDir} -vv" sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e repo_name=${repoName} -e branch_name=${branchName} -e workspace=${workspace}/${contextDir} -vv"
} else { } else {
sh buildCmd
sh 'tar zcf dist.tgz dist/' }*/
sh "mv dist.tgz ${contextDir}"
}
} }
......
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