Pārlūkot izejas kodu

deploy qa/offline-process-promotion:r170452 增加脚本注释

datard 3 gadi atpakaļ
vecāks
revīzija
1931d98020
4 mainītis faili ar 10 papildinājumiem un 37 dzēšanām
  1. 5 19
      .drone.yml
  2. 1 1
      Dockerfile
  3. 1 1
      deploy-tmp.yaml
  4. 3 16
      drone.template.yml

+ 5 - 19
.drone.yml

@@ -14,20 +14,6 @@ steps:
   commands:
    - git clone $DRONE_GIT_HTTP_URL .
 
-- name: build
-  image: plugins/docker
-  settings:
-    username: admin
-    password: Easou2)1*
-    insecure: true
-    mirror: https://ci7pm4nx.mirror.aliyuncs.com
-    registry: hub.evbj.easou.com
-    repo: hub.evbj.easou.com/qa/offline-process-promotion
-    tag: r170272
-#    build_args:
-#      - JAR_FILE=offline-process-promotion-test.jar
-#      - SERVER_PORT=8080
-
 - name: deployment
   image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
   pull: always
@@ -35,7 +21,7 @@ steps:
   environment:
     JNLP_ENV: qa
     JNLP_REPLICAS: 4
-    JNLP_TAG: r170272
+    JNLP_TAG: r170452
     JNLP_VERSION: v1  # default v1, v2 for canary
     DEPLOY_ENV: k8s-2 # 可以选择把应用部署到集群:k8s-1 or k8s-2
     JNLP_REPO: hub.evbj.easou.com
@@ -70,8 +56,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-promotion:r170272 Success"
-    description: "${DRONE_BUILD_LINK} qa/offline-process-promotion:r170272 部署完成 去掉activemq相关配置和代码"
+    title: "Pipeline qa/offline-process-promotion:r170452 Success"
+    description: "${DRONE_BUILD_LINK} qa/offline-process-promotion:r170452 部署完成 增加脚本注释"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -84,8 +70,8 @@ steps:
     corpid: ww419ee4063735e1c0
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
-    title: "Pipeline qa/offline-process-promotion:r170272 Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!去掉activemq相关配置和代码"
+    title: "Pipeline qa/offline-process-promotion:r170452 Failure"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!增加脚本注释"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:

+ 1 - 1
Dockerfile

@@ -1 +1 @@
-FROM hub.evbj.easou.com/qa/offline-process-promotion:r170272
+FROM hub.evbj.easou.com/qa/offline-process-promotion:r170452

+ 1 - 1
deploy-tmp.yaml

@@ -42,7 +42,7 @@ spec:
               topologyKey: kubernetes.io/hostname
       containers:
         - name: offline-process-promotion
-          image: hub.evbj.easou.com/qa/offline-process-promotion:r170272
+          image: hub.evbj.easou.com/qa/offline-process-promotion:r170452
           imagePullPolicy: IfNotPresent
           env:
             - name: MY_NODE_NAME

+ 3 - 16
drone.template.yml

@@ -14,20 +14,6 @@ steps:
   commands:
    - git clone $DRONE_GIT_HTTP_URL .
 
-- name: build
-  image: plugins/docker
-  settings:
-    username: admin
-    password: Easou2)1*
-    insecure: true
-    mirror: https://ci7pm4nx.mirror.aliyuncs.com
-    registry: hub.evbj.easou.com
-    repo: hub.evbj.easou.com/[ENV]/[APP]
-    tag: [TAG]
-#    build_args:
-#      - JAR_FILE=[JAR_FILE]
-#      - SERVER_PORT=8080
-
 - name: deployment
   image: hub.evbj.easou.com/dev/drone-agent:v2.0.0
   pull: always
@@ -51,6 +37,7 @@ steps:
     JNLP_LIVENESS_PER: 15
     JNLP_READINESS_INIT: 30
     JNLP_READINESS_PER: 15
+    JNLP_INGRESS_PUB: [EXPOSE]
   commands:
     # 切换目标集群
     - kubecm s $DEPLOY_ENV
@@ -70,7 +57,7 @@ steps:
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
     title: "Pipeline [ENV]/[APP]:[TAG] Success"
-    description: "${DRONE_BUILD_LINK} [ENV]/[APP]:[TAG] 部署完成"
+    description: "${DRONE_BUILD_LINK} [ENV]/[APP]:[TAG] 部署完成 [DEPLOY_MSG]"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when:
@@ -84,7 +71,7 @@ steps:
     corp_secret: zpiRBLETH9eLwIMQ4eJ_r_dcm3BPSGeLHvTcft8Ot-M
     agent_id: 1000004
     title: "Pipeline [ENV]/[APP]:[TAG] Failure"
-    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置!"
+    description: "${DRONE_BUILD_LINK} 部署失败,请检查配置![DEPLOY_MSG]"
     msg_url: ${DRONE_BUILD_LINK}
     btn_txt: "否"
   when: