From 1cb2e5487b6acb5d625c9374ba1744fbd05ccfcf Mon Sep 17 00:00:00 2001 From: Artur Zarzycki Date: Wed, 28 Dec 2016 15:03:24 +0100 Subject: [PATCH] Update k8s to 1.5 Change-Id: I83707ac26e2fdfc34a82c43e3ef6c85b81008d07 --- jenkins-tp/jobs/builders/fuel-ccp-installer-gate.sh | 3 +-- jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh | 4 ++-- jenkins-tp/jobs/builders/mcp-build-images-smoke.sh | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/jenkins-tp/jobs/builders/fuel-ccp-installer-gate.sh b/jenkins-tp/jobs/builders/fuel-ccp-installer-gate.sh index 27cedb9..b848df8 100755 --- a/jenkins-tp/jobs/builders/fuel-ccp-installer-gate.sh +++ b/jenkins-tp/jobs/builders/fuel-ccp-installer-gate.sh @@ -12,8 +12,7 @@ export SLAVES_COUNT="3" export WORKSPACE="/home/jenkins/workspace" export FUEL_DEVOPS_INSTALLATION_DIR="/home/jenkins/venv-fuel-devops-3.0" export CUSTOM_YAML='hyperkube_image_repo: "quay.io/coreos/hyperkube" -hyperkube_image_tag: "v1.4.0_coreos.1" -kube_version: "v1.4.0"' +hyperkube_image_tag: "v1.5.1_coreos.0"' echo "Running on $NODE_NAME: $ENV_NAME" source ${FUEL_DEVOPS_INSTALLATION_DIR}/bin/activate echo "Use image:" diff --git a/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh b/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh index ee57538..f952769 100644 --- a/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh +++ b/jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh @@ -13,8 +13,8 @@ FUEL_DEVOPS_SNAPSHOT_NAME="fresh" FUEL_DEVOPS_INSTALLATION_DIR="/home/jenkins/venv-fuel-devops-3.0" HYPERKUBE_REPO="quay.io/coreos/hyperkube" -HYPERKUBE_TAG="v1.4.0_coreos.1" -HYPERKUBE_VERSION="v1.4.0" +HYPERKUBE_TAG="v1.5.1_coreos.0" +HYPERKUBE_VERSION="v1.5.1" export APT_CACHE_SERVER_IP="`getent hosts cache-scc.ng.mirantis.net| awk '{print $1}'`" export APT_CACHE_SERVER_PORT="3142" diff --git a/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh b/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh index 3283215..bb9d975 100644 --- a/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh +++ b/jenkins-tp/jobs/builders/mcp-build-images-smoke.sh @@ -33,7 +33,7 @@ export DOCKER_REGISTRY="registry.mcp.fuel-infra.org" # hypercube image export HYPERKUBE_IMAGE_NAME="quay.io/coreos/hyperkube" # hypercube version -export HYPERKUBE_IMAGE_TAG="v1.4.0_coreos.1" +export HYPERKUBE_IMAGE_TAG="v1.5.1_coreos.0" # etcd version export ETCD_IMAGE_TAG="v3.0.10" # set version of openstack