switch debian8-canal-ha to ubuntu

This commit is contained in:
Matthew Mosesohn
2017-03-23 18:55:37 +03:00
parent 49e4d344da
commit 0794a866a7
3 changed files with 17 additions and 7 deletions

View File

@@ -260,10 +260,10 @@ before_script:
BOOTSTRAP_OS: coreos
RESOLVCONF_MODE: host_resolvconf # This is required as long as the CoreOS stable channel uses docker < 1.12
.debian8_canal_ha_variables: &debian8_canal_ha_variables
.ubuntu_canal_ha_variables: &ubuntu_canal_ha_variables
# stage: deploy-gce-part1
KUBE_NETWORK_PLUGIN: canal
CLOUD_IMAGE: debian-8-kubespray
CLOUD_IMAGE: ubuntu-1604-xenial
CLOUD_REGION: europe-west1-b
UPGRADE_TEST: "basic"
CLUSTER_MODE: ha
@@ -416,24 +416,24 @@ ubuntu-weave-sep-triggers:
only: ['triggers']
# More builds for PRs/merges (manual) and triggers (auto)
debian8-canal-ha:
ubuntu-canal-ha:
stage: deploy-gce-part1
<<: *job
<<: *gce
variables:
<<: *gce_variables
<<: *debian8_canal_ha_variables
<<: *ubuntu_canal_ha_variables
when: manual
except: ['triggers']
only: ['master', /^pr-.*$/]
debian8-canal-ha-triggers:
ubuntu-canal-ha-triggers:
stage: deploy-gce-part1
<<: *job
<<: *gce
variables:
<<: *gce_variables
<<: *debian8_canal_ha_variables
<<: *ubuntu_canal_ha_variables
when: on_success
only: ['triggers']