Merge pull request #2325 from kubernetes-incubator/ci_two_stages
rollback to a two stage CI
This commit is contained in:
commit
56b7400dac
1 changed files with 6 additions and 4 deletions
|
@ -7,6 +7,7 @@ stages:
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
FAILFASTCI_NAMESPACE: 'kargo-ci'
|
FAILFASTCI_NAMESPACE: 'kargo-ci'
|
||||||
|
GITLAB_REPOSITORY: 'kargo-ci/kubernetes-incubator__kubespray'
|
||||||
# DOCKER_HOST: tcp://localhost:2375
|
# DOCKER_HOST: tcp://localhost:2375
|
||||||
ANSIBLE_FORCE_COLOR: "true"
|
ANSIBLE_FORCE_COLOR: "true"
|
||||||
MAGIC: "ci check this"
|
MAGIC: "ci check this"
|
||||||
|
@ -302,7 +303,7 @@ before_script:
|
||||||
|
|
||||||
|
|
||||||
# Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
|
# Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
|
||||||
### PR JOBS
|
### PR JOBS PART1
|
||||||
gce_coreos-calico-aio:
|
gce_coreos-calico-aio:
|
||||||
stage: deploy-part1
|
stage: deploy-part1
|
||||||
<<: *job
|
<<: *job
|
||||||
|
@ -314,8 +315,9 @@ gce_coreos-calico-aio:
|
||||||
except: ['triggers']
|
except: ['triggers']
|
||||||
only: [/^pr-.*$/]
|
only: [/^pr-.*$/]
|
||||||
|
|
||||||
|
### PR JOBS PART2
|
||||||
do_ubuntu-canal-ha:
|
do_ubuntu-canal-ha:
|
||||||
stage: deploy-part1
|
stage: deploy-part2
|
||||||
<<: *job
|
<<: *job
|
||||||
<<: *do
|
<<: *do
|
||||||
variables:
|
variables:
|
||||||
|
@ -325,7 +327,7 @@ do_ubuntu-canal-ha:
|
||||||
only: [/^pr-.*$/]
|
only: [/^pr-.*$/]
|
||||||
|
|
||||||
gce_centos7-flannel-addons:
|
gce_centos7-flannel-addons:
|
||||||
stage: deploy-part1
|
stage: deploy-part2
|
||||||
<<: *job
|
<<: *job
|
||||||
<<: *gce
|
<<: *gce
|
||||||
variables:
|
variables:
|
||||||
|
@ -336,7 +338,7 @@ gce_centos7-flannel-addons:
|
||||||
only: [/^pr-.*$/]
|
only: [/^pr-.*$/]
|
||||||
|
|
||||||
gce_ubuntu-weave-sep:
|
gce_ubuntu-weave-sep:
|
||||||
stage: deploy-part1
|
stage: deploy-part2
|
||||||
<<: *job
|
<<: *job
|
||||||
<<: *gce
|
<<: *gce
|
||||||
variables:
|
variables:
|
||||||
|
|
Loading…
Reference in a new issue