x
/
fuel-ccp-ci-config
Code Issues Proposed changes

Merge "Update k8s to 1.5"

This commit is contained in:
Jenkins 2016-12-29 20:10:57 +00:00 committed by Gerrit Code Review
parent 8d9af9504d 1cb2e5487b
commit ad16fbe211
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jenkins-tp/jobs/builders/fuel-ccp-installer-gate.sh
View File

@ -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:"

4
jenkins-tp/jobs/builders/fuel-ccp-simple-deployment.sh
View File

@ -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"

2
jenkins-tp/jobs/builders/mcp-build-images-smoke.sh
View File

@ -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