fixbug

src/org/qg/StageBucket.groovy

 // src/org/foo/Stage.groovy
 package org.qg;
 
-class StageBucket {
-    def debug() {
-        print "123"
-    }
+def env = body.env
+def branchName = env.BRANCH_NAME
+def gitRepo = env.GIT_REPO
+def namespace = env.NAMESPACE
+def isDeploy = env.IS_DEPLOY
+def buildNumber = env.BUILD_NUMBER
+    
+t = gitRepo.split("/")
+def gitGroup = t[0]
+def systemName = t[1]
+
+def harborGroup = "library"
+def workspace = "/home/quant_group/jenkins_home/workspace/${env.JOB_NAME}"
+
+def imageTag
+def contextDir
 
-    def checkout(branchName, contextDir, gitRepo) {
+def checkout(branchName, contextDir, gitRepo) {
     sh "cp -r /home/quant_group/qg-dockerfiles/templates/ui ${contextDir}"
     git branch: branchName, credentialsId: 'e1ccb1ac-1282-4fb4-b766-530ca1a2a2db', url: "git@gitabc.xyqb.com:${gitRepo}.git"
     sh "git pull origin master"
-    }
+}
 
-    def build(namespace, systemName, contextDir) {
+def build(namespace, systemName, contextDir) {
     sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv"
-    }
+}
 
-    def docker_build_and_push(buildNumber, branchName, harborGroup, systemName, contextDir) {
+def docker_build_and_push(buildNumber, branchName, harborGroup, systemName, contextDir) {
     /*分支名中非法字符统一替换为下划线*/
     regex = "[`,./;\\[\\]&<>?:\"()|-]+"
     safeBranchName = branchName.replaceAll(regex,"_")
@@ -35,9 +47,9 @@ class StageBucket {
     echo "========================================="
     
     return imageTag
-    }
+}
 
-    def deploy(namespace, systemName, imageTag, tier, isDeploy) {
+def deploy(namespace, systemName, imageTag, tier, isDeploy) {
     if (isDeploy) {
         echo ("将镜像更新到到Namespace:" + namespace)
         build job: 'deployer.Updater', parameters: [
@@ -49,12 +61,12 @@ class StageBucket {
         echo "namespace不存在，不执行deploy"
         echo namespace
     }
-    }
+}
 
-    def clean(contextDir) {
+def clean(contextDir) {
     sh "rm -rf ./${contextDir}"
-    }
 }
 
 
 
+

vars/qgDockerPipeline.groovy

@@ -4,23 +4,7 @@ def call(body) {
     
     def config = [:]
     
-    def env = body.env
-    def branchName = env.BRANCH_NAME
-    def gitRepo = env.GIT_REPO
-    def namespace = env.NAMESPACE
-    def isDeploy = env.IS_DEPLOY
-    def buildNumber = env.BUILD_NUMBER
-        
-    t = gitRepo.split("/")
-    def gitGroup = t[0]
-    def systemName = t[1]
-
-    def harborGroup = "library"
-    def workspace = "/home/quant_group/jenkins_home/workspace/${env.JOB_NAME}"
-    
-    def imageTag
-    def contextDir
-    def _stage = new org.qg.StageBucket()
+    def _stage = new org.qg.StageBucket(body)
     def _utils = new org.qg.Utils()
     
     body.resolveStrategy = Closure.DELEGATE_FIRST