Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rollback to a two stage CI #2325

Merged
merged 1 commit into from
Feb 15, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ stages:

variables:
FAILFASTCI_NAMESPACE: 'kargo-ci'
GITLAB_REPOSITORY: 'kargo-ci/kubernetes-incubator__kubespray'
# DOCKER_HOST: tcp://localhost:2375
ANSIBLE_FORCE_COLOR: "true"
MAGIC: "ci check this"
Expand Down Expand Up @@ -302,7 +303,7 @@ before_script:


# Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
### PR JOBS
### PR JOBS PART1
gce_coreos-calico-aio:
stage: deploy-part1
<<: *job
Expand All @@ -314,8 +315,9 @@ gce_coreos-calico-aio:
except: ['triggers']
only: [/^pr-.*$/]

### PR JOBS PART2
do_ubuntu-canal-ha:
stage: deploy-part1
stage: deploy-part2
<<: *job
<<: *do
variables:
Expand All @@ -325,7 +327,7 @@ do_ubuntu-canal-ha:
only: [/^pr-.*$/]

gce_centos7-flannel-addons:
stage: deploy-part1
stage: deploy-part2
<<: *job
<<: *gce
variables:
Expand All @@ -336,7 +338,7 @@ gce_centos7-flannel-addons:
only: [/^pr-.*$/]

gce_ubuntu-weave-sep:
stage: deploy-part1
stage: deploy-part2
<<: *job
<<: *gce
variables:
Expand Down