From 848191e97afb219038afc3f84fa147188b8fcb08 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Thu, 18 Apr 2019 10:50:09 +0200
Subject: [PATCH] Enable working Packet CI jobs and delay GCE CI (#4559)

---
 .gitlab-ci.yml        |  1 +
 .gitlab-ci/gce.yml    | 46 +++++++++++++++++++++----------------------
 .gitlab-ci/packet.yml |  6 +++---
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f7bbbf35f..0ea57c477 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
   - moderator
   - deploy-part1
   - deploy-part2
+  - deploy-gce
   - deploy-special
 
 variables:
diff --git a/.gitlab-ci/gce.yml b/.gitlab-ci/gce.yml
index b5c32a595..6db75c322 100644
--- a/.gitlab-ci/gce.yml
+++ b/.gitlab-ci/gce.yml
@@ -31,7 +31,7 @@
   UPGRADE_TEST: "graceful"
 
 .centos7_multus_calico_variables: &centos7_multus_calico_variables
-  # stage: deploy-part2
+  # stage: deploy-gce
   UPGRADE_TEST: "graceful"
 
 # Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
@@ -47,14 +47,14 @@ gce_ubuntu18-flannel-aio:
 ### PR JOBS PART2
 
 gce_coreos-calico-aio:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   except: ['triggers']
   only: [/^pr-.*$/]
 
 gce_centos7-flannel-addons:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   except: ['triggers']
@@ -63,7 +63,7 @@ gce_centos7-flannel-addons:
 ### MANUAL JOBS
 
 gce_centos-weave-kubeadm-sep:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   variables:
     <<: *centos_weave_kubeadm_variables
@@ -71,13 +71,13 @@ gce_centos-weave-kubeadm-sep:
   only: ['triggers']
 
 gce_ubuntu-weave-sep:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   only: ['triggers']
 
 gce_coreos-calico-sep-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
@@ -89,13 +89,13 @@ gce_ubuntu-canal-ha-triggers:
   only: ['triggers']
 
 gce_centos7-flannel-addons-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
 
 gce_ubuntu-weave-sep-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
@@ -111,26 +111,26 @@ gce_ubuntu-canal-ha:
   only: ['master', /^pr-.*$/]
 
 gce_ubuntu-canal-kubeadm:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
 gce_ubuntu-canal-kubeadm-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
 
 gce_ubuntu-flannel-ha:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   except: ['triggers']
 
 gce_centos-weave-kubeadm-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   variables:
     <<: *centos_weave_kubeadm_variables
@@ -159,40 +159,40 @@ gce_ubuntu-cilium-sep:
   only: ['master', /^pr-.*$/]
 
 gce_rhel7-weave:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
 gce_rhel7-weave-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
 
 gce_debian9-calico-upgrade:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
 gce_debian9-calico-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
 
 gce_coreos-canal:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
 gce_coreos-canal-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
@@ -205,7 +205,7 @@ gce_rhel7-canal-sep:
   only: ['master', /^pr-.*$/]
 
 gce_rhel7-canal-sep-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
@@ -218,7 +218,7 @@ gce_centos7-calico-ha:
   only: ['master', /^pr-.*$/]
 
 gce_centos7-calico-ha-triggers:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: on_success
   only: ['triggers']
@@ -231,7 +231,7 @@ gce_centos7-kube-router:
   only: ['master', /^pr-.*$/]
 
 gce_centos7-multus-calico:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   variables:
     <<: *centos7_multus_calico_variables
@@ -240,7 +240,7 @@ gce_centos7-multus-calico:
   only: ['master', /^pr-.*$/]
 
 gce_opensuse-canal:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   except: ['triggers']
@@ -262,7 +262,7 @@ gce_coreos-kube-router:
   only: ['master', /^pr-.*$/]
 
 gce_ubuntu-rkt-sep:
-  stage: deploy-part2
+  stage: deploy-gce
   <<: *gce
   when: manual
   except: ['triggers']
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 69bcfdaa9..18530c4cb 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -56,14 +56,14 @@ packet_ubuntu-canal-ha:
 packet_ubuntu-canal-kubeadm:
   stage: deploy-part2
   <<: *packet
-  when: manual
+  when: on_success
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
 packet_ubuntu-flannel-ha:
   stage: deploy-part2
   <<: *packet
-  when: manual
+  when: on_success
   except: ['triggers']
 
 packet_ubuntu-contiv-sep:
@@ -90,7 +90,7 @@ packet_rhel7-weave:
 packet_debian9-calico-upgrade:
   stage: deploy-part2
   <<: *packet
-  when: manual
+  when: on_success
   except: ['triggers']
   only: ['master', /^pr-.*$/]