fixbugs

src/org/qg/StageBucket.groovy

 // src/org/foo/Stage.groovy
 package org.qg;
 
-def _prepare_java(systemName, contextDir) {
+def prepare_java(systemName, contextDir) {
     sh "rm -rf ./tmp-docker-build-context"
     sh "cp -r /home/quant_group/qg-dockerfiles/templates/java tmp-docker-build-context"
     sh "cp -r /home/quant_group/config_repository/java/${systemName}.properties ${contextDir}"
 }
 
-def _prepare_nodejs(contextDir) {
+def prepare_nodejs(contextDir) {
     sh "cp -r /home/quant_group/qg-dockerfiles/templates/nodejs ${contextDir}"
 }
 
-def _prepare_ui(contextDir) {
+def prepare_ui(contextDir) {
     sh "cp -r /home/quant_group/qg-dockerfiles/templates/ui ${contextDir}"
 }
 
-def _prepare_python(contextDir) {
+def prepare_python(contextDir) {
     sh "cp -r /home/quant_group/qg-dockerfiles/templates/python ${contextDir}"
 }
 
@@ -27,27 +27,27 @@ def checkout(branchName, gitRepo) {
 def build(namespace, systemName, contextDir, buildType) {
     switch (buildType) {
         case "java":
-            _build_java(namespace, systemName, contextDir)
+            build_java(namespace, systemName, contextDir)
         case "ui" || "nodejs":
-            _build_node(namespace, systemName, contextDir)
+            build_node(namespace, systemName, contextDir)
         case "python":
-            _build_python(namespace, systemName, contextDir)
+            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'
     break
 }
 
-def _build_node_and_ui(namespace, systemName, contextDir) {
+def build_node_and_ui(namespace, systemName, contextDir) {
     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) {
     sh "mv ${contextDir}/config.ini config.ini"
     sh "cp -f config.ini server/config/release/config.ini"   
     sh "cp -f config.ini ${configPath}"
@@ -55,7 +55,7 @@ def _build_python(namespace, systemName, contextDir) {
     break
 }
 
-def _copy_files_java(systemName, contextDir) {
+def copy_files_java(systemName, contextDir) {
     switch (systemName) {
         case "baitiao-zhitou":
             jar_path = "xyqb-btzt-internal/target/*.jar"
@@ -71,7 +71,7 @@ def _copy_files_java(systemName, contextDir) {
     sh "cp ${jar_path} ./${contextDir}"
 }
 
-def docker_build_and_push(buildNumber, branchName, harborGroup, systemName, contextDir) {
+def dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, contextDir) {
     regex = "[`,./;\\[\\]&<>?:\"()|-]+"
     safeBranchName = branchName.replaceAll(regex,"_")
     safeSystemName = "project"

vars/qgDockerPipeline.groovy

@@ -32,13 +32,13 @@ def call(body) {
             stage('prepare') {
                 switch (config.buildType) {
                     case "java":
-                        _prepare_java(namespace, systemName, contextDir)
+                        _stage.prepare_java(namespace, systemName, contextDir)
                     case "ui":
-                        _prepare_ui(namespace, systemName, contextDir)
+                        _stage.prepare_ui(namespace, systemName, contextDir)
                     case "nodejs":
-                        _prepare_nodejs(namespace, systemName, contextDir)
+                        _stage.prepare_nodejs(namespace, systemName, contextDir)
                     case "python":
-                        _prepare_python(namespace, systemName, contextDir)
+                        _stage.prepare_python(namespace, systemName, contextDir)
                 }
             }
             
@@ -50,22 +50,22 @@ def call(body) {
             stage('Build') {
                 switch (config.buildType) {
                     case "java":
-                        _build_java(namespace, systemName, contextDir)
+                        _stage.build_java(namespace, systemName, contextDir)
                     case "ui":
-                        _build_ui(namespace, systemName, contextDir)
+                        _stage.build_ui(namespace, systemName, contextDir)
                     case "nodejs":
-                        _build_nodejs(namespace, systemName, contextDir)
+                        _stage.build_nodejs(namespace, systemName, contextDir)
                     case "python":
-                        _build_python(namespace, systemName, contextDir)
+                        _stage.build_python(namespace, systemName, contextDir)
                 }
                 _stage.build(namespace, systemName, contextDir, )
             }
 
             stage('Docker Build And Push') {
                 if (buildType == "java") {
-                    _copy_files_java(systemName, contextDir)
+                    _stage.copy_files_java(systemName, contextDir)
                 }
-                imageTag = _stage.docker_build_and_push(buildNumber, branchName, harborGroup, systemName, contextDir)
+                imageTag = _stage.dockerbuild_and_push(buildNumber, branchName, harborGroup, systemName, contextDir)
             }
 
             stage('Deploy') {