Merge pull request #2325 from kubernetes-incubator/ci_two_stages

rollback to a two stage CI

.gitlab-ci.yml

@@ -7,6 +7,7 @@ stages:
 
 variables:
   FAILFASTCI_NAMESPACE: 'kargo-ci'
+  GITLAB_REPOSITORY: 'kargo-ci/kubernetes-incubator__kubespray'
 #  DOCKER_HOST: tcp://localhost:2375
   ANSIBLE_FORCE_COLOR: "true"
   MAGIC: "ci check this"
@@ -302,7 +303,7 @@ before_script:
 
 
 # Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
-### PR JOBS
+### PR JOBS PART1
 gce_coreos-calico-aio:
   stage: deploy-part1
   <<: *job
@@ -314,8 +315,9 @@ gce_coreos-calico-aio:
   except: ['triggers']
   only: [/^pr-.*$/]
 
+### PR JOBS PART2
 do_ubuntu-canal-ha:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *do
   variables:
@@ -325,7 +327,7 @@ do_ubuntu-canal-ha:
   only: [/^pr-.*$/]
 
 gce_centos7-flannel-addons:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables:
@@ -336,7 +338,7 @@ gce_centos7-flannel-addons:
   only: [/^pr-.*$/]
 
 gce_ubuntu-weave-sep:
-  stage: deploy-part1
+  stage: deploy-part2
   <<: *job
   <<: *gce
   variables: