C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #768 from bogdando/gitlab_pipes

Browse source 
Rework Gitlab pipeline stages for PRs/merges
This commit is contained in:
Antoine Legrand 2016-12-16 18:19:18 +01:00 committed by GitHub
commit cc57152cc0
2 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
.gitlab-ci.yml
View file

@ -129,7 +129,7 @@ before_script:
-e inventory_path=${PWD}/inventory/inventory.ini -e inventory_path=${PWD}/inventory/inventory.ini
-e cloud_region=${CLOUD_REGION} -e cloud_region=${CLOUD_REGION}
coreos-calico: coreos-calico-sep:
stage: deploy-gce-part1 stage: deploy-gce-part1
<<: *job <<: *job
<<: *gce <<: *gce
@ -141,9 +141,9 @@ coreos-calico:
CLUSTER_MODE: separated CLUSTER_MODE: separated
BOOTSTRAP_OS: coreos BOOTSTRAP_OS: coreos
when: on_success when: on_success
#only: [/^pr-.*$/] only: [/^pr-.*$/]
debian8-canal: debian8-canal-ha:
stage: deploy-gce-part1 stage: deploy-gce-part1
<<: *job <<: *job
<<: *gce <<: *gce
@ -154,7 +154,7 @@ debian8-canal:
CLOUD_REGION: us-east1-b CLOUD_REGION: us-east1-b
CLUSTER_MODE: ha CLUSTER_MODE: ha
when: manual when: manual
#only: [/^pr-.*$/] only: ['master', /^pr-.*$/]
rhel7-weave: rhel7-weave:
stage: deploy-gce-part1 stage: deploy-gce-part1
@ -167,7 +167,7 @@ rhel7-weave:
CLOUD_REGION: europe-west1-b CLOUD_REGION: europe-west1-b
CLUSTER_MODE: default CLUSTER_MODE: default
when: manual when: manual
#only: [/^pr-.*$/] only: ['master', /^pr-.*$/]
centos7-flannel: centos7-flannel:
stage: deploy-gce-part2 stage: deploy-gce-part2
@ -179,8 +179,8 @@ centos7-flannel:
CLOUD_IMAGE: centos-7 CLOUD_IMAGE: centos-7
CLOUD_REGION: us-west1-a CLOUD_REGION: us-west1-a
CLUSTER_MODE: default CLUSTER_MODE: default
when: manual when: on_success
only: ['master'] only: [/^pr-.*$/]
debian8-calico: debian8-calico:
stage: deploy-gce-part2 stage: deploy-gce-part2
@ -193,7 +193,7 @@ debian8-calico:
CLOUD_REGION: us-central1-b CLOUD_REGION: us-central1-b
CLUSTER_MODE: default CLUSTER_MODE: default
when: manual when: manual
only: ['master'] only: ['master', /^pr-.*$/]
coreos-canal: coreos-canal:
stage: deploy-gce-part2 stage: deploy-gce-part2
@ -207,9 +207,9 @@ coreos-canal:
CLUSTER_MODE: default CLUSTER_MODE: default
BOOTSTRAP_OS: coreos BOOTSTRAP_OS: coreos
when: manual when: manual
only: ['master'] only: ['master', /^pr-.*$/]
rhel7-canal: rhel7-canal-sep:
stage: deploy-gce-special stage: deploy-gce-special
<<: *job <<: *job
<<: *gce <<: *gce
@ -220,9 +220,9 @@ rhel7-canal:
CLOUD_REGION: us-east1-b CLOUD_REGION: us-east1-b
CLUSTER_MODE: separated CLUSTER_MODE: separated
when: manual when: manual
only: ['master'] only: ['master', /^pr-.*$/]
ubuntu-weave: ubuntu-weave-sep:
stage: deploy-gce-special stage: deploy-gce-special
<<: *job <<: *job
<<: *gce <<: *gce
@ -232,10 +232,10 @@ ubuntu-weave:
CLOUD_IMAGE: ubuntu-1604-xenial CLOUD_IMAGE: ubuntu-1604-xenial
CLOUD_REGION: us-central1-b CLOUD_REGION: us-central1-b
CLUSTER_MODE: separated CLUSTER_MODE: separated
when: manual when: on_success
only: ['master'] only: [/^pr-.*$/]
centos7-calico: centos7-calico-ha:
stage: deploy-gce-special stage: deploy-gce-special
<<: *job <<: *job
<<: *gce <<: *gce
@ -246,7 +246,7 @@ centos7-calico:
CLOUD_REGION: europe-west1-b CLOUD_REGION: europe-west1-b
CLUSTER_MODE: ha CLUSTER_MODE: ha
when: manual when: manual
only: ['master'] only: ['master', /^pr-.*$/]
syntax-check: syntax-check:
<<: *job <<: *job

4
docs/test_cases.md
View file

@ -43,11 +43,11 @@ GCE instances
| part1| calico| coreos-stable| us-west1-b| separated| on_success| | part1| calico| coreos-stable| us-west1-b| separated| on_success|
| part1| canal|debian-8-kubespray| us-east1-b| ha| manual| | part1| canal|debian-8-kubespray| us-east1-b| ha| manual|
| part1| weave| rhel-7| europe-west1-b| default| manual| | part1| weave| rhel-7| europe-west1-b| default| manual|
| part2| flannel| centos-7| us-west1-a| default| manual| | part2| flannel| centos-7| us-west1-a| default| on_success|
| part2| calico|debian-8-kubespray| us-central1-b| default| manual| | part2| calico|debian-8-kubespray| us-central1-b| default| manual|
| part2| canal| coreos-stable| us-east1-b| default| manual| | part2| canal| coreos-stable| us-east1-b| default| manual|
| special| canal| rhel-7| us-east1-b| separated| manual| | special| canal| rhel-7| us-east1-b| separated| manual|
| special| weave|ubuntu-1604-xenial| us-central1-b| separated| manual| | special| weave|ubuntu-1604-xenial| us-central1-b| separated| on_success|
| special| calico| centos-7| europe-west1-b| ha| manual| | special| calico| centos-7| europe-west1-b| ha| manual|
The "Stage" means a build step of the build pipeline. The steps are ordered as `part1->part2->special`. The "Stage" means a build step of the build pipeline. The steps are ordered as `part1->part2->special`.