|
@@ -7,7 +7,7 @@ clone:
|
|
|
|
|
|
metadata:
|
|
metadata:
|
|
namespace: ci
|
|
namespace: ci
|
|
-
|
|
|
|
|
|
+
|
|
steps:
|
|
steps:
|
|
- name: clone
|
|
- name: clone
|
|
image: hub.evbj.easou.com/dev/alpine-git:20200622
|
|
image: hub.evbj.easou.com/dev/alpine-git:20200622
|
|
@@ -19,12 +19,12 @@ steps:
|
|
pull: always
|
|
pull: always
|
|
# privileged: true
|
|
# privileged: true
|
|
environment:
|
|
environment:
|
|
- JNLP_ENV: datagroup-pro #datagroup-qa OR datagroup-pro
|
|
|
|
|
|
+ JNLP_ENV: datagroup-pro #datagroup-qa OR datagroup-pro
|
|
JNLP_ACTIVE_PROFILE: product #test OR product
|
|
JNLP_ACTIVE_PROFILE: product #test OR product
|
|
JNLP_TAG: v1.0
|
|
JNLP_TAG: v1.0
|
|
JNLP_REPLICAS: 1
|
|
JNLP_REPLICAS: 1
|
|
JNLP_JAVA_OPTS: -XX:PermSize=512M -XX:MaxPermSize=512M -Xms2048M -Xmx2048M
|
|
JNLP_JAVA_OPTS: -XX:PermSize=512M -XX:MaxPermSize=512M -Xms2048M -Xmx2048M
|
|
- JNLP_VERSION: v1 # default v1, v2 for canary
|
|
|
|
|
|
+ JNLP_VERSION: v1 # default v1, v2 for canary
|
|
DEPLOY_ENV: k8s-4 # 可以选择把应用部署到集群:k8s-1(Aliyun) or k8s-2(Qingdao) 4:jinan
|
|
DEPLOY_ENV: k8s-4 # 可以选择把应用部署到集群:k8s-1(Aliyun) or k8s-2(Qingdao) 4:jinan
|
|
JNLP_REPO: hub.evbj.easou.com
|
|
JNLP_REPO: hub.evbj.easou.com
|
|
JNLP_CONTAINER_PORT: 80
|
|
JNLP_CONTAINER_PORT: 80
|
|
@@ -48,8 +48,8 @@ steps:
|
|
# 部署服务到kubernetes上
|
|
# 部署服务到kubernetes上
|
|
- python3 /root/tools.py -a
|
|
- python3 /root/tools.py -a
|
|
# 检查服务部署状态
|
|
# 检查服务部署状态
|
|
- # - python3 /root/tools.py -c
|
|
|
|
- # 添加dns解析记录,生成访问域名1
|
|
|
|
|
|
+ # - python3 /root/tools.py -c
|
|
|
|
+ # 添加dns解析记录,生成访问域名1
|
|
- python3 /root/tools.py -d
|
|
- python3 /root/tools.py -d
|
|
|
|
|
|
- name: success
|
|
- name: success
|
|
@@ -78,4 +78,4 @@ steps:
|
|
btn_txt: "否"
|
|
btn_txt: "否"
|
|
when:
|
|
when:
|
|
status:
|
|
status:
|
|
- - failure
|
|
|
|
|
|
+ - failure
|