提交多个文件修改

提交多个文件修改

AuctionApp/DEV/AUC/Jenkinsfile

@@ -23,7 +23,7 @@ node {
             "-jar","/app/target/${CONFIG.service.jar}"]
 
         stages.execute(CONFIG, base_branch, [
-            'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini')}
+            'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini',"ahxpm")}
         ])
     }
 }

AuctionApp/DEV/BID/Jenkinsfile

@@ -23,7 +23,7 @@ node {
             "-jar","/app/target/${CONFIG.service.jar}"]
         
         stages.execute(CONFIG, base_branch, [
-            'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini')}
+            'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini',"ahxpm")}
         ])
     }
 }

AuctionApp/DEV/Deposit/Jenkinsfile

@@ -1,30 +0,0 @@
-node {
-    // Git checkout before load source the file
-    checkout scm
-    // sh '''
-    //     ls -lhrt
-    // '''
-    def base_branch = ref.tokenize('/')[2]
-    def rootDir = pwd()
-    def yaml2Map = load "./sharedLibs/yaml2Map.groovy"
-    def stages = load "./sharedLibs/stages.groovy"
-    def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-    dir("AuctionApp/DEV/Deposit") {
-        def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
-        def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
-        CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
-        println 'configs: ' + CONFIG
-        
-        String[] JAVA_ARGS = ["-Djava.security.egd=file:/dev/./urandom",
-            "-Xmx1024m",
-            "-Dspring.profiles.active=dev",
-            "-Dserver.port=80",
-            "-jar","/app/target/${CONFIG.service.jar}"]
-        stages.execute(CONFIG, base_branch, [
-            'K3SDEPLOY' : {
-                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini')
-                stages.applyService(CONFIG.service, CONFIG.k3s, base_branch)
-            }
-        ])
-    }
-}

AuctionApp/DEV/Deposit/cfg.yaml

@@ -1,12 +0,0 @@
-project:
-  git:
-    address: http://git.hobbystocks.cn/auction/auction.git
-    credentialId: gogs.hobbystocks.cn
-  service:
-    name: auction-deposit
-    version: ''
-    jar: txmall-dpst.jar
-    module: txmall-dpst
-    health: /actuator/health/readiness
-  k3s:
-    kubeconfig: k3s/k3s-dev3.yaml

AuctionApp/DEV/Deposit/configmap-env.ini

@@ -1,20 +0,0 @@
-spring.datasource.url=jdbc:mysql://192.168.56.105/auction-dpst?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-spring.datasource.username=auction
-spring.datasource.password=Pass2022
-
-spring.redis.database=2
-spring.redis.password=Pass2010
-spring.redis.sentinel.master=poyee-master
-spring.redis.sentinel.nodes=192.168.56.105:26379
-
-dpst.getlotUrl=http://auction-auc/internal/lot/getDeposit
-dpst.notifyUrl=http://auction-deposit/internal/notify
-dpst.payUrl=http://auction-pay/internal/makeOrder
-dpst.chkPayUrl=http://auction-pay/internal/chkPay
-dpst.refundUrl=http://auction-pay/internal/makeRefund
-dpst.getUserUrl=https://sso.txmall.zcunsoft.com/api/backend/getInfo
-
-logging.fluentd.enabled=true
-logging.fluentd.host=192.168.56.105
-logging.fluentd.port=24224
-logging.console.enabled=true

AuctionApp/DEV/Deposit/deployment.yaml

@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: <service_name><service_version>
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: <service_name><service_version>
-      release: <release>
-  template:
-    metadata:
-      labels:
-        app: <service_name><service_version>
-        release: <release>
-      annotations:
-        commit-sha: "<COMMIT_SHA>"
-    spec:
-      imagePullSecrets:
-      - name: <imagePullSecret>
-      containers:
-      - name: <service_name>
-        image: <docker_image>
-        command: ["java"]
-        args: <java_args>
-        readinessProbe:
-          httpGet:
-            path: <service_health>
-            port: 80
-          initialDelaySeconds: 15
-          periodSeconds: 30
-          failureThreshold: 3
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: <configmap_env_name>

AuctionApp/DEV/Deposit/service.yaml

@@ -1,12 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: <service_name><service_version>
-spec:
-  selector:
-    app: <service_name><service_version>
-    release: <release>
-  ports:
-  - port: 80
-    targetPort: 80

AuctionApp/DEV/H5-App/Jenkinsfile

@@ -1,48 +0,0 @@
-node {
-    // Git checkout before load source the file
-    checkout scm
-    // sh '''
-    //     ls -lhrt
-    // '''
-    def base_branch = ref.tokenize('/')[2]
-    def rootDir  = pwd()
-    def yaml2Map = load "./sharedLibs/yaml2Map.groovy"
-    def stages   = load "./sharedLibs/stages.nodejs.groovy"
-    def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-
-    dir("AuctionApp/DEV/H5-App") {
-        def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
-        def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
-        CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
-        println 'configs: ' + CONFIG
-        
-        //生成Dockerfile
-        def generateDockerfile = {->
-
-            pathOfDockerfile = 'projdir'
-            def module = CONFIG.service.module == null ? '' : (CONFIG.service.module[-1] == '/' ? CONFIG.service.module : CONFIG.service.module + '/')
-            echo "-----> Generating Dockerfile: ${pathOfDockerfile}/Dockerfile ..."
-            sh """cat > ${pathOfDockerfile}/Dockerfile<<EOF
-FROM node:14-slim as BUILD
-LABEL stage=STATICRES-BUILD
-
-COPY ./ /proj
-WORKDIR /proj
-RUN npm config set registry https://registry.npm.taobao.org && npm install && npm run build
-
-FROM nginx:1.23-alpine as FINAL
-
-# configs for auction-dev.hobbystocks.cn
-COPY ./dockerfiles/auction-h5.conf /etc/nginx/conf.d/default.conf
-COPY ./other /usr/share/nginx
-COPY --from=BUILD /proj/dist /usr/share/nginx/auction
-EOF
-"""
-            return pathOfDockerfile
-        }
-
-        stages.execute(CONFIG, base_branch, [
-            'GENERATEDOCKERFILE': generateDockerfile
-        ])
-    }
-}

AuctionApp/DEV/H5-App/cfg.yaml

@@ -1,10 +0,0 @@
-project:
-  git:
-    #address: http://git.hobbystocks.cn/auction/h5.git
-    address: http://git.hobbystocks.cn/auction/HS-APP-H5.git
-    credentialId: gogs.hobbystocks.cn
-  service:
-    name: auction-h5
-    version: ''
-  k3s:
-    kubeconfig: k3s/k3s-dev2.yaml

AuctionApp/DEV/H5-App/deployment.yaml

@@ -1,26 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: <service_name><service_version>
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: <service_name><service_version>
-      release: <release>
-  template:
-    metadata:
-      labels:
-        app: <service_name><service_version>
-        release: <release>
-      annotations:
-        commit-sha: "<COMMIT_SHA>"
-    spec:
-      imagePullSecrets:
-      - name: <imagePullSecret>
-      containers:
-      - name: <service_name>
-        image: <docker_image>
-        ports:
-        - name: http
-          containerPort: 80

AuctionApp/DEV/H5-App/service.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: auction-h5
-  namespace: default
-spec:
-  ports:
-  - port: 80
-    protocol: TCP
-    targetPort: 80
-  selector:
-    app: auction-h5
-  sessionAffinity: None
-  type: ClusterIP

AuctionApp/DEV/H5-Partner/Jenkinsfile

@@ -1,47 +0,0 @@
-node {
-    // Git checkout before load source the file
-    checkout scm
-    // sh '''
-    //     ls -lhrt
-    // '''
-    def base_branch = ref.tokenize('/')[2]
-    def rootDir  = pwd()
-    def yaml2Map = load "./sharedLibs/yaml2Map.groovy"
-    def stages   = load "./sharedLibs/stages.nodejs.groovy"
-    def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-
-    dir("AuctionApp/DEV/H5-Partner") {
-        def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
-        def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
-        CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
-        println 'configs: ' + CONFIG
-        
-        //生成Dockerfile
-        def generateDockerfile = {->
-
-            pathOfDockerfile = 'projdir'
-            def module = CONFIG.service.module == null ? '' : (CONFIG.service.module[-1] == '/' ? CONFIG.service.module : CONFIG.service.module + '/')
-            echo "-----> Generating Dockerfile: ${pathOfDockerfile}/Dockerfile ..."
-            sh """cat > ${pathOfDockerfile}/Dockerfile<<EOF
-FROM node:16-slim as BUILD
-LABEL stage=STATICRES-BUILD
-
-COPY ./ /proj
-WORKDIR /proj
-RUN npm config set registry https://registry.npm.taobao.org && npm install && npm run build:prod
-
-FROM nginx:1.23-alpine as FINAL
-
-# configs for auction-dev.hobbystocks.cn
-COPY ./dockerfiles/auction-h5.conf /etc/nginx/conf.d
-COPY --from=BUILD /proj/dist /usr/share/nginx/auction
-EOF
-"""
-            return pathOfDockerfile
-        }
-
-        stages.execute(CONFIG, base_branch, [
-            'GENERATEDOCKERFILE': generateDockerfile
-        ])
-    }
-}

AuctionApp/DEV/H5-Partner/cfg.yaml

@@ -1,9 +0,0 @@
-project:
-  git:
-    address: http://git.hobbystocks.cn/auction/HS-PARTNER-H5.git
-    credentialId: gogs.hobbystocks.cn
-  service:
-    name: auction-partner-h5
-    version: ''
-  k3s:
-    kubeconfig: k3s/k3s-dev2.yaml

AuctionApp/DEV/H5-Partner/deployment.yaml

@@ -1,26 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: <service_name><service_version>
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: <service_name><service_version>
-      release: <release>
-  template:
-    metadata:
-      labels:
-        app: <service_name><service_version>
-        release: <release>
-      annotations:
-        commit-sha: "<COMMIT_SHA>"
-    spec:
-      imagePullSecrets:
-      - name: <imagePullSecret>
-      containers:
-      - name: <service_name>
-        image: <docker_image>
-        ports:
-        - name: http
-          containerPort: 80

AuctionApp/DEV/H5-Partner/service.yaml

@@ -1,14 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: auction-partner-h5
-  namespace: default
-spec:
-  ports:
-  - port: 80
-    protocol: TCP
-    targetPort: 80
-  selector:
-    app: auction-partner-h5
-  sessionAffinity: None
-  type: ClusterIP

AuctionApp/DEV/Order/Jenkinsfile

@@ -22,7 +22,7 @@ node {
             "-jar","/app/target/${CONFIG.service.jar}"]
         stages.execute(CONFIG, base_branch, [
             'K3SDEPLOY' : {
-                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini')
+                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini',"ahxpm")
                 stages.applyService(CONFIG.service, CONFIG.k3s, base_branch)
             }
         ])

AuctionApp/DEV/PUB/Jenkinsfile

@@ -1,30 +0,0 @@
-node {
-    // Git checkout before load source the file
-    checkout scm
-    // sh '''
-    //     ls -lhrt
-    // '''
-    def base_branch = ref.tokenize('/')[2]
-    def rootDir = pwd()
-    def yaml2Map = load "./sharedLibs/yaml2Map.groovy"
-    def stages = load "./sharedLibs/stages.groovy"
-    def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-    dir("AuctionApp/DEV/PUB") {
-        def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
-        def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
-        CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
-        println 'configs: ' + CONFIG
-        
-        String[] JAVA_ARGS = ["-Djava.security.egd=file:/dev/./urandom",
-            "-Xmx1024m",
-            "-Dspring.profiles.active=dev",
-            "-Dserver.port=80",
-            "-jar","/app/target/${CONFIG.service.jar}"]
-        stages.execute(CONFIG, base_branch, [
-            'K3SDEPLOY' : {
-                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini')
-                stages.applyService(CONFIG.service, CONFIG.k3s, base_branch)
-            }
-        ])
-    }
-}

AuctionApp/DEV/PUB/cfg.yaml

@@ -1,12 +0,0 @@
-project:
-  git:
-    address: http://git.hobbystocks.cn/auction/auction.git
-    credentialId: gogs.hobbystocks.cn
-  service:
-    name: auction-pub
-    version: ''
-    jar: txmall-pub.jar
-    module: txmall-pub
-    health: /actuator/health/readiness
-  k3s:
-    kubeconfig: k3s/k3s-dev3.yaml

AuctionApp/DEV/PUB/configmap-env.ini

@@ -1,8 +0,0 @@
-spring.datasource.url=jdbc:mysql://192.168.56.105/auction-auc?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
-spring.datasource.username=auction
-spring.datasource.password=Pass2022
-
-logging.fluentd.enabled=true
-logging.fluentd.host=192.168.56.105
-logging.fluentd.port=24224
-logging.console.enabled=true

AuctionApp/DEV/PUB/deployment.yaml

@@ -1,38 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: <service_name><service_version>
-  namespace: default
-spec:
-  selector:
-    matchLabels:
-      app: <service_name><service_version>
-      release: <release>
-  template:
-    metadata:
-      labels:
-        app: <service_name><service_version>
-        release: <release>
-      annotations:
-        commit-sha: "<COMMIT_SHA>"
-    spec:
-      imagePullSecrets:
-      - name: <imagePullSecret>
-      containers:
-      - name: <service_name>
-        image: <docker_image>
-        command: ["java"]
-        args: <java_args>
-        readinessProbe:
-          httpGet:
-            path: <service_health>
-            port: 80
-          initialDelaySeconds: 15
-          periodSeconds: 30
-          failureThreshold: 3
-        ports:
-        - name: http
-          containerPort: 80
-        envFrom:
-        - configMapRef:
-            name: <configmap_env_name>

AuctionApp/DEV/PUB/service.yaml

@@ -1,12 +0,0 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: <service_name><service_version>
-spec:
-  selector:
-    app: <service_name><service_version>
-    release: <release>
-  ports:
-  - port: 80
-    targetPort: 80

AuctionApp/DEV/Pay/Jenkinsfile

@@ -22,7 +22,7 @@ node {
             "-jar","/app/target/${CONFIG.service.jar}"]
         stages.execute(CONFIG, base_branch, [
             'K3SDEPLOY' : {
-                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini')
+                stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini',"ahxpm")
                 stages.applyService(CONFIG.service, CONFIG.k3s, base_branch)
             }
         ])

poyee-admin/DEV/Jenkinsfile

@@ -10,7 +10,7 @@ node {
     jdk = tool name: 'openJDK8'
     env.JAVA_HOME = "${jdk}"
 
-    dir("AHX-admin/DEV") {
+    dir("poyee-admin/DEV") {
         def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
         def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
         CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
@@ -47,7 +47,7 @@ EOF
             def base_branch = actionParameter.tokenize('/')[2]
             stages.upgrade(CONFIG, base_branch, K8S_BACKUPS, [
                 'GENERATEDOCKERFILE': generateDockerFile,
-                'K3SDEPLOY' : {stages.deployWithConfigmaps(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini", "./configmap")}
+                'K3SDEPLOY' : {stages.deployWithConfigmaps(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini", "./configmap","ahxpm")}
             ])
         }
     }

poyee-app/DEV/Jenkinsfile

@@ -81,7 +81,7 @@ pipeline {
                         jdk = tool name: 'openJDK8'
                         env.JAVA_HOME = "${jdk}"
                         
-                        dir("AHX-app/DEV") {
+                        dir("poyee-app/DEV") {
 
                             def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
                             def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
@@ -123,7 +123,7 @@ EOF
                                 stages.upgrade(CONFIG, base_branch, K8S_BACKUPS, [
                                     'POST_GITCLONE': { sh 'cp -r ../../skywalking-agent-9.0.0 projdir/skywalking-agent' },
                                     'GENERATEDOCKERFILE': {generateDockerfile()},
-                                    'K3SDEPLOY' : {stages.deployWithConfigmaps(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini", "./configmap")}
+                                    'K3SDEPLOY' : {stages.deployWithConfigmaps(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini", "./configmap","ahxpm")}
                                 ])
                             }
                             sh 'rm -rf projdir/skywalking-agent'

poyee-auction-modules/DEV/order/Jenkinsfile

@@ -12,7 +12,7 @@ node {
     jdk = tool name: 'openJDK8'
     env.JAVA_HOME = "${jdk}"
     
-    dir("AHX-auction-modules/DEV/order") {
+    dir("poyee-auction-modules/DEV/order") {
 
         def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
         def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
@@ -45,7 +45,7 @@ EOF
             def base_branch = actionParameter.tokenize('/')[2]
             stages.upgrade(CONFIG, base_branch, K8S_BACKUPS, [
                 'GENERATEDOCKERFILE' : {generateDockerfile()},
-                'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini")}
+                'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini","ahxpm")}
             ])
         }
     }

poyee-auction-modules/DEV/pay/Jenkinsfile

@@ -13,7 +13,7 @@ node {
     jdk = tool name: 'openJDK8'
     env.JAVA_HOME = "${jdk}"
     
-    dir("AHX-auction-modules/DEV/pay") {
+    dir("poyee-auction-modules/DEV/pay") {
 
         def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
         def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
@@ -48,7 +48,7 @@ EOF
             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")}
+                'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini","ahxpm")}
             ])
         }
     }

poyee-im/DEV/Jenkinsfile

@@ -21,7 +21,7 @@ pipeline {
                         jdk = tool name: 'openJDK17'
                         env.JAVA_HOME = "${jdk}"
 
-                        dir("AHX-im/DEV") {
+                        dir("poyee-im/DEV") {
 
                             sh "ls /var/jenkins_home/workspace/IM-DEV/poyee-im/DEV"
                             def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
@@ -53,7 +53,7 @@ EOF
                                 "-jar","/app/target/${CONFIG.service.jar}"]
                             stages.execute(CONFIG, base_branch, [
                                 'GENERATEDOCKERFILE': {generateDockerfile()},
-                                'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini')}
+                                'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, './configmap-env.ini',"ahxpm")}
                             ])
 
                             sh 'rm -rf projdir/skywalking-agent'

poyee-mall/DEV/Jenkinsfile

@@ -10,7 +10,7 @@ node {
     env.JAVA_HOME = "${jdk}"
 
     def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-    dir("AHX-mall/DEV") {
+    dir("poyee-mall/DEV") {
         def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
         def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
         CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
@@ -50,7 +50,7 @@ EOF
             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")}
+                'K3SDEPLOY' : {stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, base_branch, JAVA_ARGS, "./configmap-env.ini","ahxpm")}
             ])
         }
 

poyee-order/DEV/Jenkinsfile

@@ -10,7 +10,7 @@ node {
     env.JAVA_HOME = "${jdk}"
     
     def GLOBAL_CONFIG = yaml2Map.read('global.yaml').project
-    dir("AHX-order/DEV") {
+    dir("poyee-order/DEV") {
         def PROJECT_CONFIG = yaml2Map.read('cfg.yaml').project
         def CONFIG = yaml2Map.merge(PROJECT_CONFIG, GLOBAL_CONFIG)
         CONFIG.docker.image = String.format(CONFIG.docker.image, CONFIG.service.name)
@@ -50,8 +50,8 @@ EOF
             stages.upgrade(CONFIG, base_branch, K8S_BACKUPS, [
                 'GENERATEDOCKERFILE': {generateDockerfile()},
                 'K3SDEPLOY' : {
-                    stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, "dev", JAVA_ARGS, "./configmap-env.ini")
-                    stages.deployWithConfigmapEnvOnly2nd(CONFIG.service, CONFIG.k3s, "dev", JAVA_ARGS_2ND, './configmap-env.ini')
+                    stages.deployWithConfigmapEnvOnly(CONFIG.service, CONFIG.k3s, "dev", JAVA_ARGS, "./configmap-env.ini","ahxpm")
+                    stages.deployWithConfigmapEnvOnly2nd(CONFIG.service, CONFIG.k3s, "dev", JAVA_ARGS_2ND, './configmap-env.ini',"ahxpm")
                 }
             ])
         }