Commit 924d77c3 authored by 钟尚武's avatar 钟尚武

Merge branch 'master' into 'deploy/like-stage'

fix drone

See merge request alpha/sun!407
parents 6ce08a78 30be8701
...@@ -6,6 +6,9 @@ steps: ...@@ -6,6 +6,9 @@ steps:
image: plugins/docker image: plugins/docker
when: when:
branch: deploy/like-test branch: deploy/like-test
instance:
exclude:
- cicd.iyanzhi.com
settings: settings:
dockerfile: deploy/test/Dockerfile dockerfile: deploy/test/Dockerfile
registry: ccr.ccs.tencentyun.com registry: ccr.ccs.tencentyun.com
...@@ -19,6 +22,9 @@ steps: ...@@ -19,6 +22,9 @@ steps:
image: plugins/docker image: plugins/docker
when: when:
branch: deploy/like-stage branch: deploy/like-stage
instance:
exclude:
- cicd.gmapp.env
settings: settings:
dockerfile: deploy/stage/Dockerfile dockerfile: deploy/stage/Dockerfile
registry: ccr.ccs.tencentyun.com registry: ccr.ccs.tencentyun.com
...@@ -32,6 +38,9 @@ steps: ...@@ -32,6 +38,9 @@ steps:
image: plugins/docker image: plugins/docker
when: when:
branch: deploy/like-prod branch: deploy/like-prod
instance:
exclude:
- cicd.gmapp.env
settings: settings:
dockerfile: deploy/prod/Dockerfile dockerfile: deploy/prod/Dockerfile
registry: ccr.ccs.tencentyun.com registry: ccr.ccs.tencentyun.com
...@@ -47,9 +56,12 @@ steps: ...@@ -47,9 +56,12 @@ steps:
environment: environment:
repo: alpha/sun repo: alpha/sun
when: when:
branch:
- deploy/like-prod
- deploy/like-stage
instance: instance:
exclude: exclude:
- aidrone.iyanzhi.com - cicd.gmapp.env
settings: settings:
namespace: ${DRONE_BRANCH} namespace: ${DRONE_BRANCH}
template: deploy.yaml template: deploy.yaml
...@@ -60,15 +72,47 @@ steps: ...@@ -60,15 +72,47 @@ steps:
environment: environment:
repo: alpha/sun repo: alpha/sun
when: when:
branch:
- deploy/like-prod
- deploy/like-stage
instance: instance:
exclude: exclude:
- aidrone.iyanzhi.com
- cicd.gmapp.env - cicd.gmapp.env
settings: settings:
namespace: ${DRONE_BRANCH} namespace: ${DRONE_BRANCH}
template: deploy.celery.yaml template: deploy.celery.yaml
tag: ${DRONE_COMMIT} tag: ${DRONE_COMMIT}
- name: deploy-app-test
image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:test
when:
branch:
- deploy/like-test
instance:
exclude:
- cicd.iyanzhi.com
environment:
repo: alpha/sun
settings:
namespace: ${DRONE_BRANCH}
template: deploy.yaml
tag: ${DRONE_COMMIT}
- name: deploy-celery-test
image: ccr.ccs.tencentyun.com/gm-ai/drone-kube:test
when:
branch:
- deploy/like-test
instance:
exclude:
- cicd.iyanzhi.com
environment:
repo: alpha/sun
settings:
namespace: ${DRONE_BRANCH}
template: deploy.celery.yaml
tag: ${DRONE_COMMIT}
trigger: trigger:
branch: branch:
- deploy/* - deploy/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment