github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-17 23:19:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26932 from aaronlevy/conformance-fix

Browse Source 
Automatic merge from submit-queue

Allow conformance tests to run on non-GCE providers

fixes https://github.com/kubernetes/kubernetes/issues/26869

Creates a skeleton provider which has all the required function stubs -- but will allow a previously set "skeleton" KUBERNETES_PROVIDER to not be overriden with "gce".
This commit is contained in:
k8s-merge-robot
2016-06-21 14:30:58 -07:00
committed by GitHub
parent f32d23ad73 e8d1dae1a9
commit 0e562d29c7
4 changed files with 105 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/ginkgo-e2e.sh
View File

@@ -46,7 +46,7 @@ source "${KUBE_ROOT}/cluster/kube-util.sh"
# ---- Do cloud-provider-specific setup
if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
echo "Conformance test: not doing test setup."
KUBERNETES_PROVIDER=""
KUBERNETES_PROVIDER="skeleton"
detect-master-from-kubeconfig