fixbug

src/libs/stage.groovy

@@ -2,36 +2,35 @@
 package libs;
 import libs.utils;
 
-class Stage {
-    def branchName = env.BRANCH_NAME
-    def gitRepo = env.GIT_REPO
-    def namespace = env.NAMESPACE
-    def isDeploy = env.IS_DEPLOY
+def branchName = env.BRANCH_NAME
+def gitRepo = env.GIT_REPO
+def namespace = env.NAMESPACE
+def isDeploy = env.IS_DEPLOY
 
-    t = gitRepo.split("/")
-    def gitGroup = t[0]
-    def systemName = t[1]
+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 harborGroup = "library"
+def workspace = "/home/quant_group/jenkins_home/workspace/${env.JOB_NAME}"
 
-    def buildNumber
-    def imageTag
+def buildNumber
+def imageTag
 
-    def utils = new libs.utils()
-    def contextDir = utils.contextDir()
+def utils = new libs.utils()
+def contextDir = utils.contextDir()
 
-    def checkout() {
+def checkout() {
     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() {
+def build() {
     sh "ansible-playbook /etc/ansible/build.yml -e prefix=${namespace} -e project_name=pre.${systemName} -e workspace=${contextDir} -vv"
-    }
+}
 
-    def docker_build_and_push() {
+def docker_build_and_push() {
     buildNumber = env.BUILD_NUMBER
 
     /*分支名中非法字符统一替换为下划线*/
@@ -51,9 +50,9 @@ class Stage {
     echo "=================镜像地址================="
     echo imageTag
     echo "========================================="
-    }
+}
 
-    def deploy() {
+def deploy() {
     if (isDeploy) {
         echo ("将镜像更新到到Namespace:" + namespace)
         build job: 'deployer.Updater', parameters: [
@@ -65,11 +64,10 @@ class Stage {
         echo "namespace不存在，不执行deploy"
         echo namespace
     }
-    }
+}
 
-    def clean() {
+def clean() {
     sh "rm -rf ./${contextDir}"
-    }
 }
 
 

vars/standardPipeline.groovy

@@ -3,7 +3,7 @@ import libs.stage;
 def call(body) {
     
     def config = [:]
-    def stage = new libs.stage.Stage()
+    def stage = new libs.stage()
     
     body.resolveStrategy = Closure.DELEGATE_FIRST
     body.delegate = config