From e03aa795fa87c7b5fd3b5022d395dcab704f1b54 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Thu, 26 Mar 2020 21:56:24 +0100
Subject: [PATCH] Move long running jobs into separate CI stage (#5837)

---
 .gitlab-ci.yml        |  1 +
 .gitlab-ci/packet.yml | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 99d71f71f..be84adbeb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
   - deploy-part1
   - moderator
   - deploy-part2
+  - deploy-part3
   - deploy-special
 
 variables:
diff --git a/.gitlab-ci/packet.yml b/.gitlab-ci/packet.yml
index 1f48e3d8b..656479a22 100644
--- a/.gitlab-ci/packet.yml
+++ b/.gitlab-ci/packet.yml
@@ -78,13 +78,6 @@ packet_debian9-macvlan-sep:
   extends: .packet
   when: manual
 
-packet_debian9-calico-upgrade:
-  stage: deploy-part2
-  extends: .packet
-  when: on_success
-  variables:
-    UPGRADE_TEST: graceful
-
 packet_debian9-calico-upgrade-once:
   stage: deploy-part2
   extends: .packet
@@ -142,8 +135,18 @@ packet_amazon-linux-2-aio:
   extends: .packet
   when: manual
 
+# ### PR JOBS PART3
+# Long jobs (45min+)
+
+packet_debian9-calico-upgrade:
+  stage: deploy-part3
+  extends: .packet
+  when: on_success
+  variables:
+    UPGRADE_TEST: graceful
+
 packet_ubuntu18-calico-ha-recover:
-  stage: deploy-part2
+  stage: deploy-part3
   extends: .packet
   when: on_success
   variables:
@@ -151,7 +154,7 @@ packet_ubuntu18-calico-ha-recover:
     RECOVER_CONTROL_PLANE_TEST_GROUPS: "etcd[2:],kube-master[1:]"
 
 packet_ubuntu18-calico-ha-recover-noquorum:
-  stage: deploy-part2
+  stage: deploy-part3
   extends: .packet
   when: on_success
   variables: