Commit ee225d17 authored by wentao.suo's avatar wentao.suo

ffff

parent 2274e561
......@@ -28,6 +28,7 @@ def before_prepare() {
}
def prepare_config(buildType,systemName, contextDir) {
_utils().beautyEcho("Prepare Config +++ ${buildType} ${systemName} ${branchName}", "info")
switch (buildType) {
case "java":
prepare_java(systemName, contextDir)
......@@ -61,9 +62,9 @@ def prepare_luaui(systemName, contextDir) {
sh "cp -rf /home/quant_group/qg-dockerfiles/templates_new/lua-ui/* ${contextDir}"
sh "cp -rf /home/quant_group/config_repository/lua-ui/lua/*.lua ${contextDir}"
def isVhFileExist = fileExists "/home/quant_group/config_repository/lua-ui/nginx/${systemNames}.vh.conf"
def isVhFileExist = fileExists "/home/quant_group/config_repository/lua-ui/nginx/${systemName}.vh.conf"
if (isVhFileExist) {
sh "cp -rf /home/quant_group/config_repository/lua-ui/nginx/${systemNames}.vh.conf ${contextDir}"
sh "cp -rf /home/quant_group/config_repository/lua-ui/nginx/${systemName}.vh.conf ${contextDir}"
}else{
sh "cp -rf /home/quant_group/config_repository/lua-ui/nginx/default.vh.conf ${contextDir}"
}
......@@ -80,7 +81,7 @@ def prepare_python(systemName, contextDir) {
}
def checkout(buildType,systemName, branchName) {
_utils().beautyEcho("checkout ${buildType} ${systemName} ${branchName}", "info")
_utils().beautyEcho("CheckOut +++ ${buildType} ${systemName} ${branchName}", "info")
switch(buildType){
case "java":
checkout_java(systemName, branchName)
......@@ -346,7 +347,7 @@ def checkAndBuild(buildType,systemName,branchName,contextDir){
docker.image(pacegeDockerInfo["image"]).inside(pacegeDockerInfo["args"]){
/*checkout code*/
_utils().beautyEcho("checkout", "info")
checkout(buildType, systemName, branchName)
/*prepare config*/
......
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