diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 21abfb629..7c155e0b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -375,17 +375,6 @@ gce_centos-weave-kubeadm-sep: except: ['triggers'] only: [/^pr-.*$/] -gce_ubuntu-flannel-ha: - stage: deploy-part2 - <<: *job - <<: *gce - variables: - <<: *gce_variables - <<: *ubuntu_flannel_variables - when: on_success - except: ['triggers'] - only: [/^pr-.*$/] - ### MANUAL JOBS gce_ubuntu-weave-sep: @@ -429,7 +418,6 @@ gce_centos7-flannel-addons-triggers: when: on_success only: ['triggers'] - gce_ubuntu-weave-sep-triggers: stage: deploy-part2 <<: *job @@ -483,6 +471,16 @@ gce_ubuntu-canal-kubeadm-triggers: when: on_success only: ['triggers'] +gce_ubuntu-flannel-ha: + stage: deploy-part2 + <<: *job + <<: *gce + variables: + <<: *gce_variables + <<: *ubuntu_flannel_variables + when: manual + except: ['triggers'] + gce_centos-weave-kubeadm-triggers: stage: deploy-part2 <<: *job