mac před 2 roky
rodič
revize
2b831e9351
2 změnil soubory, kde provedl 37 přidání a 38 odebrání
  1. 17 18
      .drone.yml
  2. 20 20
      drone/.drone-prod.yml

+ 17 - 18
.drone.yml

@@ -750,7 +750,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-transfer/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -844,7 +844,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-system/kxs-system-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -858,11 +858,11 @@ steps:
         path: /kxs-system # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-system-a-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -882,11 +882,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: kxs-system-a-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -905,11 +905,11 @@ steps:
         path: /kxs-system # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-system-b-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -929,11 +929,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: kxs-system-b-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -952,7 +952,6 @@ trigger:
     include:
       - pull_request
       - push
-
 ---
 kind: pipeline
 type: docker
@@ -987,7 +986,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-user/kxs-user-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -1001,11 +1000,11 @@ steps:
         path: /kxs-user # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-user-a-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-user-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -1025,11 +1024,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -1072,11 +1071,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:

+ 20 - 20
drone/.drone-prod.yml

@@ -31,7 +31,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-gateway/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-gateway/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-gateway/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -174,7 +174,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-transfer/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-transfer/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -267,7 +267,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-system/kxs-system-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-system/kxs-system-biz/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -281,11 +281,11 @@ steps:
         path: /kxs-system # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-system-a-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -305,11 +305,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: kxs-system-a-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -328,11 +328,11 @@ steps:
         path: /kxs-system # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-system-b-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -352,11 +352,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: kxs-system-b-host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-system-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -410,7 +410,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-user/kxs-user-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-user/kxs-user-biz/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -424,11 +424,11 @@ steps:
         path: /kxs-user # 容器内目录 绝对路径
     settings:
       host:
-        from_secret: kxs-user-a-host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: kxs-user-pwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       target: /home/ABServer/deploy-ready/
@@ -448,11 +448,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-user-system-a-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -495,11 +495,11 @@ steps:
     depends_on: [scp-project] # 依赖的步骤
     settings:
       host:
-        from_secret: host
+        from_secret: kxs-user-system-b-host
       username:
         from_secret: username
       password:
-        from_secret: userpwd
+        from_secret: kxs-user-system-pwd
       port: 22
       command_timeout: 2m
       script:
@@ -552,7 +552,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-product/kxs-product-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-product/kxs-product-biz/target/config /drone/src/dist/ # 复制文件
     when:
       status:
@@ -742,7 +742,7 @@ steps:
       - name: mvn_config
         path: /usr/share/maven/conf/
     commands: # 执行命令
-      - mvn clean package -Dmaven.test.skip=true -P test
+      - mvn clean package -Dmaven.test.skip=true -P prod
       - cp /drone/src/kxs-store/kxs-store-biz/target/*.jar /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/lib /drone/src/dist/ && cp -r /drone/src/kxs-store/kxs-store-biz/target/config /drone/src/dist/ # 复制文件
     when:
       status: