mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-09 05:01:46 +00:00
Revive conformance test.
Use KUBE_CONFIG_FILE instead of AUTH_CONFIG (and CERT_DIR). Pass GINKGO_TEST_ARGS for a subset of e2e tests which @erictune has deemed initially sufficient for conformance. Allow GINKGO_TEST_ARGS to pass through hack/ginkgo-e2e.sh. Set NUM_MINIONS (need better way to handle this). Remove use of "KUBERNETES_CONFORMANCE_TEST" variable and use of KUBERNETES_PROVIDER="conformance_test" convention, both of which have no apparent purpose. Allow unset testContext.provider in test/e2e/e2e_test.go Allow testContext.Provider to be unset in providerIs().
This commit is contained in:
@@ -42,7 +42,13 @@ export KUBECTL KUBE_CONFIG_FILE
|
||||
source "${KUBE_ROOT}/cluster/kube-env.sh"
|
||||
|
||||
# ---- Do cloud-provider-specific setup
|
||||
if [[ -z "${AUTH_CONFIG:-}" ]]; then
|
||||
if [[ -n "${KUBERNETES_CONFORMANCE_TEST:-}" ]]; then
|
||||
echo "Conformance test: not doing test setup."
|
||||
KUBERNETES_PROVIDER=""
|
||||
auth_config=(
|
||||
"--kubeconfig=${KUBECONFIG}"
|
||||
)
|
||||
else
|
||||
echo "Setting up for KUBERNETES_PROVIDER=\"${KUBERNETES_PROVIDER}\"."
|
||||
|
||||
source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
|
||||
@@ -51,23 +57,9 @@ if [[ -z "${AUTH_CONFIG:-}" ]]; then
|
||||
|
||||
detect-master >/dev/null
|
||||
|
||||
if [[ "${KUBERNETES_PROVIDER}" == "conformance_test" ]]; then
|
||||
auth_config=(
|
||||
"--auth-config=${KUBERNETES_CONFORMANCE_TEST_AUTH_CONFIG:-}"
|
||||
"--cert-dir=${KUBERNETES_CONFORMANCE_TEST_CERT_DIR:-}"
|
||||
)
|
||||
else
|
||||
auth_config=(
|
||||
"--kubeconfig=${KUBECONFIG:-$DEFAULT_KUBECONFIG}"
|
||||
)
|
||||
fi
|
||||
else
|
||||
echo "Conformance Test. No cloud-provider-specific preparation."
|
||||
KUBERNETES_PROVIDER=""
|
||||
auth_config=(
|
||||
"--auth-config=${AUTH_CONFIG:-}"
|
||||
"--cert-dir=${CERT_DIR:-}"
|
||||
)
|
||||
auth_config=(
|
||||
"--kubeconfig=${KUBECONFIG:-$DEFAULT_KUBECONFIG}"
|
||||
)
|
||||
fi
|
||||
|
||||
if [[ -n "${NODE_INSTANCE_PREFIX:-}" ]]; then
|
||||
@@ -81,6 +73,9 @@ if [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then
|
||||
fi
|
||||
|
||||
ginkgo_args=()
|
||||
if [[ -n ${CONFORMANCE_TEST_SKIP_REGEX:-} ]]; then
|
||||
ginkgo_args+=("--skip=\"${CONFORMANCE_TEST_SKIP_REGEX}\"")
|
||||
fi
|
||||
if [[ ${GINKGO_PARALLEL} =~ ^[yY]$ ]]; then
|
||||
ginkgo_args+=("-p")
|
||||
fi
|
||||
|
Reference in New Issue
Block a user