Commit 425befa4 authored by daidekun's avatar daidekun

fixbugs

parent 67e4f0a6
...@@ -24,27 +24,12 @@ def checkout(branchName, gitRepo) { ...@@ -24,27 +24,12 @@ def checkout(branchName, gitRepo) {
sh "git pull origin master" sh "git pull origin master"
} }
def build(namespace, systemName, contextDir, buildType) {
switch (buildType) {
case "java":
build_java(namespace, systemName, contextDir)
case "ui" || "nodejs":
build_node(namespace, systemName, contextDir)
case "python":
build_python(namespace, systemName, contextDir)
default:
break
}
}
def build_java(namespace, systemName, contextDir) { def build_java(namespace, systemName, contextDir) {
sh '/usr/share/maven/bin/mvn clean package -P test -D maven.test.skip=true' sh '/usr/share/maven/bin/mvn clean package -P test -D maven.test.skip=true'
break
} }
def build_node_and_ui(namespace, systemName, contextDir) { def build_nodejs_and_ui(namespace, systemName, contextDir) {
sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv" sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv"
break
} }
def build_python(namespace, systemName, contextDir) { def build_python(namespace, systemName, contextDir) {
...@@ -52,7 +37,6 @@ def build_python(namespace, systemName, contextDir) { ...@@ -52,7 +37,6 @@ def build_python(namespace, systemName, contextDir) {
sh "cp -f config.ini server/config/release/config.ini" sh "cp -f config.ini server/config/release/config.ini"
sh "cp -f config.ini ${configPath}" sh "cp -f config.ini ${configPath}"
sh 'tar zcf dist.tgz server/' sh 'tar zcf dist.tgz server/'
break
} }
def copy_files_java(systemName, contextDir) { def copy_files_java(systemName, contextDir) {
......
...@@ -57,11 +57,8 @@ def call(body) { ...@@ -57,11 +57,8 @@ def call(body) {
case "java": case "java":
_stage.build_java(namespace, systemName, contextDir) _stage.build_java(namespace, systemName, contextDir)
break break
case "ui": case "ui" || "nodejs":
_stage.build_ui(namespace, systemName, contextDir) _stage.build_nodejs_and_ui(namespace, systemName, contextDir)
break
case "nodejs":
_stage.build_nodejs(namespace, systemName, contextDir)
break break
case "python": case "python":
_stage.build_python(namespace, systemName, contextDir) _stage.build_python(namespace, systemName, 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