Merge branch 'master' of http://git.hobbystocks.cn/AHX-Bid/deployments

AuctionApp/DEV/AUC/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: <service_name><service_version>
-  namespace: default
+  namespace: ahxpm
 spec:
   selector:
     matchLabels:

AuctionApp/DEV/BID/deployment.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: <service_name><service_version>
-  namespace: default
+  namespace: ahxpm
 spec:
   selector:
     matchLabels:

poyee-mall/DEV/Jenkinsfile

@@ -38,18 +38,13 @@ EOF
             "-jar","/app/target/${CONFIG.service.jar}"]
         String[] K8S_BACKUPS = []
 
-        // sh 'cp -r ../../skywalking-agent-9.0.0 projdir/skywalking-agent'
-
         if ("upgrade" == action || "upgrade:selected" == action) {
 
             def base_branch = actionParameter.tokenize('/')[2]
             stages.upgrade(CONFIG, base_branch, K8S_BACKUPS, [
-                'POST_GITCLONE': { sh 'cp -r ../../skywalking-agent-9.0.0 projdir/skywalking-agent' },
                 'GENERATEDOCKERFILE': {generateDockerfile()},
                 'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini","ahxpm")}
             ])
         }
-
-        sh 'rm -rf projdir/skywalking-agent'
     }
 }