Commit 7137f524 authored by wentao.suo's avatar wentao.suo

fix

parent e9a2e128
...@@ -83,10 +83,24 @@ def prepare_java(systemName, contextDir) { ...@@ -83,10 +83,24 @@ def prepare_java(systemName, contextDir) {
def prepare_nodejs(systemName, contextDir) { def prepare_nodejs(systemName, contextDir) {
sh "cp -rf /home/quant_group/qg-dockerfiles/templates/nodejs/* ${contextDir}" sh "cp -rf /home/quant_group/qg-dockerfiles/templates/nodejs/* ${contextDir}"
sh "cp -rf /home/quant_group/config_repository/nodejs/${systemName}.js env.config" sh "cp -rf /home/quant_group/config_repository/nodejs/${systemName}.js env.config"
def specialNpmrc = new File( "/home/quant_group/config_repository/lua-ui/npmrc/${systemName}-npmrc" )
def npmrcPath = "/home/quant_group/config_repository/lua-ui/npmrc/common-npmrc"
if(specialNpmrc.exists()){
npmrcPath = "/home/quant_group/config_repository/lua-ui/npmrc/${systemName}-npmrc"
}
sh "cp -rf ${npmrcPath} .npmrc"
} }
def prepare_luaui(systemName, contextDir) { def prepare_luaui(systemName, contextDir) {
sh "cp -rf /home/quant_group/config_repository/lua-ui/config/${systemName}.js ${systemName}.env.config" sh "cp -rf /home/quant_group/config_repository/lua-ui/config/${systemName}.js ${systemName}.env.config"
def specialNpmrc = new File( "/home/quant_group/config_repository/lua-ui/npmrc/${systemName}-npmrc" )
def npmrcPath = "/home/quant_group/config_repository/lua-ui/npmrc/common-npmrc"
if(specialNpmrc.exists()){
npmrcPath = "/home/quant_group/config_repository/lua-ui/npmrc/${systemName}-npmrc"
}
sh "cp -rf ${npmrcPath} .npmrc"
} }
def prepare_python(systemName, contextDir) { def prepare_python(systemName, contextDir) {
...@@ -171,12 +185,6 @@ def checkout_luaui(systemName, branchName) { ...@@ -171,12 +185,6 @@ def checkout_luaui(systemName, branchName) {
sh "whoami" sh "whoami"
echo "----------------------------" echo "----------------------------"
def specialNpmrc = new File( "/home/quant_group/config_repository/lua-ui/npmrc/${systemName}-npmrc" )
def npmrcPath = "/home/quant_group/config_repository/lua-ui/npmrc/common-npmrc"
if(specialNpmrc.exists()){
npmrcPath = "/home/quant_group/config_repository/lua-ui/npmrc/${systemName}-npmrc"
}
_utils().beautyEcho("ui project : ${systemName}" , "info") _utils().beautyEcho("ui project : ${systemName}" , "info")
...@@ -193,7 +201,7 @@ def checkout_luaui(systemName, branchName) { ...@@ -193,7 +201,7 @@ def checkout_luaui(systemName, branchName) {
git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
sh "cp -rf ${npmrcPath} ${currentPath}/.npmrc"
def bowerResult = ext_bower_install() def bowerResult = ext_bower_install()
def npmResult = ext_npm_intall() def npmResult = ext_npm_intall()
def resultNum = bowerResult +npmResult def resultNum = bowerResult +npmResult
...@@ -212,7 +220,7 @@ def checkout_luaui(systemName, branchName) { ...@@ -212,7 +220,7 @@ def checkout_luaui(systemName, branchName) {
} }
}else{ }else{
sh "cp -rf ${npmrcPath} ${currentPath}/.npmrc"
if(!packejson.exists()){ if(!packejson.exists()){
echo ">>>>>>> is simple ui project" echo ">>>>>>> is simple ui project"
git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: gitPath
......
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