From a495bbc1db07f2fa3a16bec37aad7ff68b07fd69 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Tue, 21 Mar 2017 16:41:30 +0300 Subject: [PATCH] Disable download_run_once and download_localhost for most CI scenarios This adds time to deployment, so we should only test it sparingly during daily master. --- .gitlab-ci.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e41f5da37..22689518c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,6 +50,8 @@ before_script: ANSIBLE_KEEP_REMOTE_FILES: "1" ANSIBLE_CONFIG: ./tests/ansible.cfg BOOTSTRAP_OS: none + DOWNLOAD_LOCALHOST: "false" + DOWNLOAD_RUN_ONCE: "false" IDEMPOT_CHECK: "false" UPGRADE_TEST: "false" RESOLVCONF_MODE: docker_dns @@ -116,8 +118,8 @@ before_script: -e cert_management=${CERT_MGMT:-script} -e cloud_provider=gce -e deploy_netchecker=true - -e download_localhost=true - -e download_run_once=true + -e download_localhost=${DOWNLOAD_LOCALHOST} + -e download_run_once=${DOWNLOAD_RUN_ONCE} -e etcd_deployment_type=${ETCD_DEPLOYMENT} -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} -e kubelet_deployment_type=${KUBELET_DEPLOYMENT} @@ -142,8 +144,8 @@ before_script: -e bootstrap_os=${BOOTSTRAP_OS} -e cloud_provider=gce -e deploy_netchecker=true - -e download_localhost=true - -e download_run_once=true + -e download_localhost=${DOWNLOAD_LOCALHOST} + -e download_run_once=${DOWNLOAD_RUN_ONCE} -e etcd_deployment_type=${ETCD_DEPLOYMENT} -e kube_network_plugin=${KUBE_NETWORK_PLUGIN} -e kubelet_deployment_type=${KUBELET_DEPLOYMENT} @@ -173,8 +175,8 @@ before_script: --private-key=${HOME}/.ssh/id_rsa -e bootstrap_os=${BOOTSTRAP_OS} -e ansible_python_interpreter=${PYPATH} - -e download_run_once=true - -e download_localhost=true + -e download_localhost=${DOWNLOAD_LOCALHOST} + -e download_run_once=${DOWNLOAD_RUN_ONCE} -e deploy_netchecker=true -e resolvconf_mode=${RESOLVCONF_MODE} -e local_release_dir=${PWD}/downloads @@ -214,8 +216,8 @@ before_script: --private-key=${HOME}/.ssh/id_rsa -e bootstrap_os=${BOOTSTRAP_OS} -e ansible_python_interpreter=${PYPATH} - -e download_run_once=true - -e download_localhost=true + -e download_localhost=${DOWNLOAD_LOCALHOST} + -e download_run_once=${DOWNLOAD_RUN_ONCE} -e deploy_netchecker=true -e resolvconf_mode=${RESOLVCONF_MODE} -e local_release_dir=${PWD}/downloads @@ -315,6 +317,8 @@ before_script: .centos7_calico_ha_variables: ¢os7_calico_ha_variables # stage: deploy-gce-special KUBE_NETWORK_PLUGIN: calico + DOWNLOAD_LOCALHOST: "true" + DOWNLOAD_RUN_ONCE: "true" CLOUD_IMAGE: centos-7 CLOUD_REGION: europe-west1-b CLUSTER_MODE: ha-scale