From e5a450349bf0ba6011dffabd711e116178896b46 Mon Sep 17 00:00:00 2001
From: Antoine Legrand <2t.antoine@gmail.com>
Date: Tue, 13 Feb 2018 12:30:14 +0100
Subject: [PATCH] Single step CI

---
 .gitlab-ci.yml | 81 +++++++++++++++++++++++++++-----------------------
 1 file changed, 43 insertions(+), 38 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1b5e8a6a7..9241e0bb9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,7 +300,9 @@ before_script:
 # stage: deploy-special
   MOVED_TO_GROUP_VARS: "true"
 
+
 # Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
+### PR JOBS
 gce_coreos-calico-aio:
   stage: deploy-part1
   <<: *job
@@ -322,50 +324,63 @@ do_ubuntu-canal-ha:
   except: ['triggers']
   only: [/^pr-.*$/]
 
-gce_coreos-calico-sep-triggers:
+gce_centos7-flannel-addons:
   stage: deploy-part1
   <<: *job
   <<: *gce
   variables:
     <<: *gce_variables
-    <<: *coreos_calico_aio_variables
+    <<: *centos7_flannel_addons_variables
   when: on_success
-  only: ['triggers']
+  except: ['triggers']
+  only: [/^pr-.*$/]
 
-gce_centos7-flannel-addons:
-  stage: deploy-part2
+gce_ubuntu-weave-sep:
+  stage: deploy-part1
   <<: *job
   <<: *gce
   variables:
     <<: *gce_variables
-    <<: *centos7_flannel_addons_variables
+    <<: *ubuntu_weave_sep_variables
   when: on_success
   except: ['triggers']
   only: [/^pr-.*$/]
 
-gce_centos7-flannel-addons-triggers:
-  stage: deploy-part1
+### MANUAL JOBS
+gce_coreos-calico-sep-triggers:
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
     <<: *gce_variables
-    <<: *centos7_flannel_addons_variables
+    <<: *coreos_calico_aio_variables
   when: on_success
   only: ['triggers']
 
-gce_ubuntu-weave-sep:
-  stage: deploy-special
+
+gce_ubuntu-canal-ha-triggers:
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
     <<: *gce_variables
-    <<: *ubuntu_weave_sep_variables
+    <<: *ubuntu_canal_ha_variables
   when: on_success
-  except: ['triggers']
-  only: [/^pr-.*$/]
+  only: ['triggers']
+
+gce_centos7-flannel-addons-triggers:
+  stage: deploy-part2
+  <<: *job
+  <<: *gce
+  variables:
+    <<: *gce_variables
+    <<: *centos7_flannel_addons_variables
+  when: on_success
+  only: ['triggers']
+
 
 gce_ubuntu-weave-sep-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -376,7 +391,7 @@ gce_ubuntu-weave-sep-triggers:
 
 # More builds for PRs/merges (manual) and triggers (auto)
 gce_ubuntu-canal-ha:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -386,18 +401,8 @@ gce_ubuntu-canal-ha:
   except: ['triggers']
   only: ['master', /^pr-.*$/]
 
-gce_ubuntu-canal-ha-triggers:
-  stage: deploy-part1
-  <<: *job
-  <<: *gce
-  variables:
-    <<: *gce_variables
-    <<: *ubuntu_canal_ha_variables
-  when: on_success
-  only: ['triggers']
-
 gce_ubuntu-canal-kubeadm:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -408,7 +413,7 @@ gce_ubuntu-canal-kubeadm:
   only: ['master', /^pr-.*$/]
 
 gce_ubuntu-canal-kubeadm-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -418,7 +423,7 @@ gce_ubuntu-canal-kubeadm-triggers:
   only: ['triggers']
 
 gce_centos-weave-kubeadm:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -429,7 +434,7 @@ gce_centos-weave-kubeadm:
   only: ['master', /^pr-.*$/]
 
 gce_centos-weave-kubeadm-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -450,7 +455,7 @@ gce_ubuntu-contiv-sep:
   only: ['master', /^pr-.*$/]
 
 gce_rhel7-weave:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -461,7 +466,7 @@ gce_rhel7-weave:
   only: ['master', /^pr-.*$/]
 
 gce_rhel7-weave-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -482,7 +487,7 @@ gce_debian8-calico-upgrade:
   only: ['master', /^pr-.*$/]
 
 gce_debian8-calico-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -503,7 +508,7 @@ gce_coreos-canal:
   only: ['master', /^pr-.*$/]
 
 gce_coreos-canal-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -524,7 +529,7 @@ gce_rhel7-canal-sep:
   only: ['master', /^pr-.*$/,]
 
 gce_rhel7-canal-sep-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -545,7 +550,7 @@ gce_centos7-calico-ha:
   only: ['master', /^pr-.*$/]
 
 gce_centos7-calico-ha-triggers:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -567,7 +572,7 @@ gce_coreos-alpha-weave-ha:
   only: ['master', /^pr-.*$/]
 
 gce_ubuntu-rkt-sep:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -578,7 +583,7 @@ gce_ubuntu-rkt-sep:
   only: ['master', /^pr-.*$/]
 
 gce_ubuntu-vault-sep:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables: