github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18318 from ihmccreery/use-test-default-e2e

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2015-12-16 19:54:31 -08:00
commit 74b851c565
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hack/jenkins/e2e.sh
View File

@ -102,10 +102,7 @@ function configure_upgrade_step() {
${GKE_FLAKY_TESTS[@]:+${GKE_FLAKY_TESTS[@]}} \ ${GKE_FLAKY_TESTS[@]:+${GKE_FLAKY_TESTS[@]}} \
)" )"
if [[ "${KUBERNETES_PROVIDER}" == "gke" ]]; then if [[ "${KUBERNETES_PROVIDER}" == "gce" ]]; then
DOGFOOD_GCLOUD="true"
GKE_API_ENDPOINT="https://test-container.sandbox.googleapis.com/"
else
NUM_NODES=5 NUM_NODES=5
KUBE_ENABLE_DEPLOYMENTS=true KUBE_ENABLE_DEPLOYMENTS=true
KUBE_ENABLE_DAEMONSETS=true KUBE_ENABLE_DAEMONSETS=true
@ -249,6 +246,10 @@ if [[ ${JOB_NAME} =~ ^kubernetes-.*-gce ]]; then
elif [[ ${JOB_NAME} =~ ^kubernetes-.*-gke ]]; then elif [[ ${JOB_NAME} =~ ^kubernetes-.*-gke ]]; then
KUBERNETES_PROVIDER="gke" KUBERNETES_PROVIDER="gke"
: ${E2E_ZONE:="us-central1-f"} : ${E2E_ZONE:="us-central1-f"}
# By default, GKE tests run against the GKE test endpoint using CI Cloud SDK.
# Release jobs (e.g. prod, staging, and test) override these two variables.
: ${CLOUDSDK_BUCKET:="gs://cloud-sdk-build/testing/staging"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
elif [[ ${JOB_NAME} =~ ^kubernetes-.*-aws ]]; then elif [[ ${JOB_NAME} =~ ^kubernetes-.*-aws ]]; then
KUBERNETES_PROVIDER="aws" KUBERNETES_PROVIDER="aws"
: ${E2E_MIN_STARTUP_PODS:="1"} : ${E2E_MIN_STARTUP_PODS:="1"}
@ -652,9 +653,6 @@ case ${JOB_NAME} in
;; ;;
kubernetes-e2e-gke-ci) kubernetes-e2e-gke-ci)
: ${DOGFOOD_GCLOUD:="true"}
: ${CLOUDSDK_BUCKET:="gs://cloud-sdk-build/testing/staging"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci"} : ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci"}
: ${E2E_NETWORK:="e2e-gke-ci"} : ${E2E_NETWORK:="e2e-gke-ci"}
: ${E2E_SET_CLUSTER_API_VERSION:=y} : ${E2E_SET_CLUSTER_API_VERSION:=y}
@ -669,9 +667,6 @@ case ${JOB_NAME} in
;; ;;
kubernetes-e2e-gke-ci-reboot) kubernetes-e2e-gke-ci-reboot)
: ${DOGFOOD_GCLOUD:="true"}
: ${CLOUDSDK_BUCKET:="gs://cloud-sdk-build/testing/staging"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"} : ${E2E_CLUSTER_NAME:="jkns-gke-e2e-ci-reboot"}
: ${E2E_NETWORK:="e2e-gke-ci-reboot"} : ${E2E_NETWORK:="e2e-gke-ci-reboot"}
: ${E2E_SET_CLUSTER_API_VERSION:=y} : ${E2E_SET_CLUSTER_API_VERSION:=y}
@ -688,9 +683,6 @@ case ${JOB_NAME} in
;; ;;
kubernetes-e2e-gke-flaky) kubernetes-e2e-gke-flaky)
: ${DOGFOOD_GCLOUD:="true"}
: ${CLOUDSDK_BUCKET:="gs://cloud-sdk-build/testing/staging"}
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="kubernetes-gke-e2e-flaky"} : ${E2E_CLUSTER_NAME:="kubernetes-gke-e2e-flaky"}
: ${E2E_NETWORK:="gke-e2e-flaky"} : ${E2E_NETWORK:="gke-e2e-flaky"}
: ${E2E_SET_CLUSTER_API_VERSION:=y} : ${E2E_SET_CLUSTER_API_VERSION:=y}
@ -703,7 +695,6 @@ case ${JOB_NAME} in
# Sets up the GKE soak cluster weekly using the latest CI release. # Sets up the GKE soak cluster weekly using the latest CI release.
kubernetes-soak-weekly-deploy-gke) kubernetes-soak-weekly-deploy-gke)
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="jenkins-gke-soak-weekly"} : ${E2E_CLUSTER_NAME:="jenkins-gke-soak-weekly"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
: ${E2E_NETWORK:="gke-soak-weekly"} : ${E2E_NETWORK:="gke-soak-weekly"}
@ -718,7 +709,6 @@ case ${JOB_NAME} in
# Runs tests on GKE soak cluster. # Runs tests on GKE soak cluster.
kubernetes-soak-continuous-e2e-gke) kubernetes-soak-continuous-e2e-gke)
: ${GKE_API_ENDPOINT:="https://test-container.sandbox.googleapis.com/"}
: ${E2E_CLUSTER_NAME:="jenkins-gke-soak-weekly"} : ${E2E_CLUSTER_NAME:="jenkins-gke-soak-weekly"}
: ${E2E_NETWORK:="gke-soak-weekly"} : ${E2E_NETWORK:="gke-soak-weekly"}
: ${E2E_DOWN:="false"} : ${E2E_DOWN:="false"}
@ -1115,7 +1105,6 @@ export CLUSTER_NAME=${E2E_CLUSTER_NAME}
export ZONE=${E2E_ZONE} export ZONE=${E2E_ZONE}
export KUBE_GKE_NETWORK=${E2E_NETWORK} export KUBE_GKE_NETWORK=${E2E_NETWORK}
export E2E_SET_CLUSTER_API_VERSION=${E2E_SET_CLUSTER_API_VERSION:-} export E2E_SET_CLUSTER_API_VERSION=${E2E_SET_CLUSTER_API_VERSION:-}
export DOGFOOD_GCLOUD=${DOGFOOD_GCLOUD:-}
export CMD_GROUP=${CMD_GROUP:-} export CMD_GROUP=${CMD_GROUP:-}
export MACHINE_TYPE=${NODE_SIZE:-} # GKE scripts use MACHINE_TYPE for the node vm size export MACHINE_TYPE=${NODE_SIZE:-} # GKE scripts use MACHINE_TYPE for the node vm size