diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d49fd26d..c21bb0c43 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -320,16 +320,6 @@ gce_coreos-calico-aio: only: [/^pr-.*$/] ### 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: stage: deploy-part2 <<: *job @@ -363,7 +353,6 @@ gce_coreos-calico-sep-triggers: when: on_success only: ['triggers'] - gce_ubuntu-canal-ha-triggers: stage: deploy-part2 <<: *job @@ -396,6 +385,16 @@ gce_ubuntu-weave-sep-triggers: only: ['triggers'] # 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: stage: deploy-part2 <<: *job diff --git a/README.md b/README.md index 7d592f851..dc15d2099 100644 --- a/README.md +++ b/README.md @@ -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) -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.