Single step CI

This commit is contained in:
Antoine Legrand 2018-02-13 12:30:14 +01:00
parent 7a20d69809
commit e5a450349b

View file

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