Split deploy steps in separate playbooks: part1 (#3451)

* Fix bootstrap_os/ubuntu idempotency

* Update bastion role

* move container_engine in sub-roles

* requires ansible 2.5

* ubuntu18 as first CI job
This commit is contained in:
Antoine Legrand
2018-10-10 04:14:33 +02:00
committed by k8s-ci-robot
parent 2ab2f3a0a3
commit c27a91f7f0
55 changed files with 109 additions and 88 deletions

View File

@@ -42,7 +42,7 @@ before_script:
tags:
- kubernetes
- docker
image: quay.io/kubespray/kubespray:latest
image: quay.io/kubespray/kubespray:v2.7
.docker_service: &docker_service
services:
@@ -323,12 +323,13 @@ before_script:
# Builds for PRs only (premoderated by unit-tests step) and triggers (auto)
### PR JOBS PART1
gce_coreos-calico-aio:
gce_ubuntu18-flannel-aio:
stage: deploy-part1
<<: *job
<<: *gce
variables:
<<: *coreos_calico_aio_variables
<<: *ubuntu18_flannel_aio_variables
<<: *gce_variables
when: on_success
except: ['triggers']
@@ -336,14 +337,14 @@ gce_coreos-calico-aio:
### PR JOBS PART2
gce_ubuntu18-flannel-aio:
gce_coreos-calico-aio:
stage: deploy-part2
<<: *job
<<: *gce
variables:
<<: *ubuntu18_flannel_aio_variables
<<: *coreos_calico_aio_variables
<<: *gce_variables
when: manual
when: on_success
except: ['triggers']
only: [/^pr-.*$/]
@@ -358,7 +359,7 @@ gce_centos7-flannel-addons:
except: ['triggers']
only: [/^pr-.*$/]
gce_centos-weave-kubeadm:
gce_centos-weave-kubeadm-sep:
stage: deploy-part2
<<: *job
<<: *gce
@@ -369,6 +370,8 @@ gce_centos-weave-kubeadm:
except: ['triggers']
only: [/^pr-.*$/]
### MANUAL JOBS
gce_ubuntu-weave-sep:
stage: deploy-part2
<<: *job
@@ -376,11 +379,10 @@ gce_ubuntu-weave-sep:
variables:
<<: *gce_variables
<<: *ubuntu_weave_sep_variables
when: on_success
when: manual
except: ['triggers']
only: [/^pr-.*$/]
### MANUAL JOBS
gce_coreos-calico-sep-triggers:
stage: deploy-part2
<<: *job