Remove DigitalOcean

This commit is contained in:
Antoine Legrand 2018-03-07 13:37:07 +01:00
parent 6975cd1622
commit 9e44f94176
2 changed files with 11 additions and 12 deletions

View file

@ -320,16 +320,6 @@ gce_coreos-calico-aio:
only: [/^pr-.*$/] only: [/^pr-.*$/]
### PR JOBS PART2 ### PR JOBS PART2
do_ubuntu-canal-ha:
stage: deploy-part2
<<: *job
<<: *do
variables:
<<: *do_variables
when: on_success
except: ['triggers']
only: [/^pr-.*$/]
gce_centos7-flannel-addons: gce_centos7-flannel-addons:
stage: deploy-part2 stage: deploy-part2
<<: *job <<: *job
@ -363,7 +353,6 @@ gce_coreos-calico-sep-triggers:
when: on_success when: on_success
only: ['triggers'] only: ['triggers']
gce_ubuntu-canal-ha-triggers: gce_ubuntu-canal-ha-triggers:
stage: deploy-part2 stage: deploy-part2
<<: *job <<: *job
@ -396,6 +385,16 @@ gce_ubuntu-weave-sep-triggers:
only: ['triggers'] only: ['triggers']
# More builds for PRs/merges (manual) and triggers (auto) # More builds for PRs/merges (manual) and triggers (auto)
do_ubuntu-canal-ha:
stage: deploy-part2
<<: *job
<<: *do
variables:
<<: *do_variables
when: manual
except: ['triggers']
only: ['master', /^pr-.*$/]
gce_ubuntu-canal-ha: gce_ubuntu-canal-ha:
stage: deploy-part2 stage: deploy-part2
<<: *job <<: *job

View file

@ -150,5 +150,5 @@ CI Tests
[![Build graphs](https://gitlab.com/kubespray-ci/kubernetes-incubator__kubespray/badges/master/build.svg)](https://gitlab.com/kubespray-ci/kubernetes-incubator__kubespray/pipelines) [![Build graphs](https://gitlab.com/kubespray-ci/kubernetes-incubator__kubespray/badges/master/build.svg)](https://gitlab.com/kubespray-ci/kubernetes-incubator__kubespray/pipelines)
CI/end-to-end tests sponsored by Google (GCE), DigitalOcean, [teuto.net](https://teuto.net/) (openstack). CI/end-to-end tests sponsored by Google (GCE)
See the [test matrix](docs/test_cases.md) for details. See the [test matrix](docs/test_cases.md) for details.