From a642c77e82a54049d83e3db8c7a9f658e15ec260 Mon Sep 17 00:00:00 2001 From: Matthew Mosesohn Date: Mon, 4 Jul 2016 15:18:48 +0300 Subject: [PATCH] Fix kargo builder job Change-Id: I86cc48fb5f2b79815a49596f67a8b1f044daf58c --- jenkins-dev/jobs/builders/kargo-deploy-env-k8s.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-dev/jobs/builders/kargo-deploy-env-k8s.sh b/jenkins-dev/jobs/builders/kargo-deploy-env-k8s.sh index 0b9c873..e089dc8 100644 --- a/jenkins-dev/jobs/builders/kargo-deploy-env-k8s.sh +++ b/jenkins-dev/jobs/builders/kargo-deploy-env-k8s.sh @@ -12,14 +12,14 @@ export DEPLOY_METHOD="kargo" export SLAVES_COUNT=$PARAM_SLAVES_COUNT export WORKSPACE="/home/jenkins/workspace" if [ -z "$CUSTOM_YAML" ]; then -export CUSTOM_YAML='kube_network_plugin: "calico" + export CUSTOM_YAML='kube_network_plugin: "calico" #Required for calico kube_proxy_mode: "iptables" #Configure calico to set --nat-outgoing and --ipip pool option cloud_provider: "generic" #Experimental etcd container deployment etcd_deployment_type: "docker"' - +fi source /home/jenkins/venv-nailgun-tests-3.0/bin/activate echo "Running on $NODE_NAME: $ENV_NAME"