github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Splitting OS_DISTRIBUTION into NODE_OS_DISTRIBUTION and

Browse Source 
MASTER_OS_DISTRIBUTION.
This commit is contained in:
Maisem Ali
2016-06-23 11:22:04 -07:00
parent bea382c124
commit 97f3f80833
23 changed files with 334 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/jenkins/e2e-runner.sh
View File

@@ -215,7 +215,7 @@ if [[ -n "${JENKINS_GCI_IMAGE_FAMILY:-}" ]]; then
GCI_STAGING_PROJECT=container-vm-image-staging
export KUBE_GCE_MASTER_PROJECT="${GCI_STAGING_PROJECT}"
export KUBE_GCE_MASTER_IMAGE="$(get_latest_gci_image "${GCI_STAGING_PROJECT}" "${JENKINS_GCI_IMAGE_FAMILY}")"
export KUBE_OS_DISTRIBUTION="gci"
export KUBE_MASTER_OS_DISTRIBUTION="gci"
if [[ "${JENKINS_GCI_IMAGE_FAMILY}" == "gci-canary-test" ]]; then
# The family "gci-canary-test" is reserved for a special type of GCI images
# that are used to continuously validate Docker releases.