github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

jenkins/e2e: only run ./cluster/gce/list-resources.sh if it exists

Browse Source
This commit is contained in:
Jeff Grafton 2015-10-12 11:19:57 -07:00
parent a06d8bc523
commit 1a3d273bdb
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hack/jenkins/e2e.sh
View File

@ -955,9 +955,17 @@ cd kubernetes
ARTIFACTS=${WORKSPACE}/_artifacts ARTIFACTS=${WORKSPACE}/_artifacts
mkdir -p ${ARTIFACTS} mkdir -p ${ARTIFACTS}
export E2E_REPORT_DIR=${ARTIFACTS} export E2E_REPORT_DIR=${ARTIFACTS}
declare -r gcp_list_resources_script="./cluster/gce/list-resources.sh"
declare -r gcp_resources_before="${ARTIFACTS}/gcp-resources-before.txt" declare -r gcp_resources_before="${ARTIFACTS}/gcp-resources-before.txt"
declare -r gcp_resources_cluster_up="${ARTIFACTS}/gcp-resources-cluster-up.txt" declare -r gcp_resources_cluster_up="${ARTIFACTS}/gcp-resources-cluster-up.txt"
declare -r gcp_resources_after="${ARTIFACTS}/gcp-resources-after.txt" declare -r gcp_resources_after="${ARTIFACTS}/gcp-resources-after.txt"
# TODO(15492): figure out some way to run this script even if it doesn't exist
# in the Kubernetes tarball.
if [[ ( ${KUBERNETES_PROVIDER} == "gce" || ${KUBERNETES_PROVIDER} == "gke" ) && -x "${gcp_list_resources_script}" ]]; then
gcp_list_resources="true"
else
gcp_list_resources="false"
fi
### Pre Set Up ### ### Pre Set Up ###
# Install gcloud from a custom path if provided. Used to test GKE with gcloud # Install gcloud from a custom path if provided. Used to test GKE with gcloud
@ -977,13 +985,13 @@ fi
### Set up ### ### Set up ###
if [[ "${E2E_UP,,}" == "true" ]]; then if [[ "${E2E_UP,,}" == "true" ]]; then
go run ./hack/e2e.go ${E2E_OPT} -v --down go run ./hack/e2e.go ${E2E_OPT} -v --down
if [[ ${KUBERNETES_PROVIDER} == "gce" || ${KUBERNETES_PROVIDER} == "gke" ]]; then if [[ "${gcp_list_resources}" == "true" ]]; then
./cluster/gce/list-resources.sh > "${gcp_resources_before}" ${gcp_list_resources_script} > "${gcp_resources_before}"
fi fi
go run ./hack/e2e.go ${E2E_OPT} -v --up go run ./hack/e2e.go ${E2E_OPT} -v --up
go run ./hack/e2e.go -v --ctl="version --match-server-version=false" go run ./hack/e2e.go -v --ctl="version --match-server-version=false"
if [[ ${KUBERNETES_PROVIDER} == "gce" || ${KUBERNETES_PROVIDER} == "gke" ]]; then if [[ "${gcp_list_resources}" == "true" ]]; then
./cluster/gce/list-resources.sh > "${gcp_resources_cluster_up}" ${gcp_list_resources_script} > "${gcp_resources_cluster_up}"
fi fi
fi fi
@ -1027,8 +1035,8 @@ if [[ "${E2E_DOWN,,}" == "true" ]]; then
# for the wait between attempts. # for the wait between attempts.
sleep 30 sleep 30
go run ./hack/e2e.go ${E2E_OPT} -v --down go run ./hack/e2e.go ${E2E_OPT} -v --down
if [[ ${KUBERNETES_PROVIDER} == "gce" || ${KUBERNETES_PROVIDER} == "gke" ]]; then if [[ "${gcp_list_resources}" == "true" ]]; then
./cluster/gce/list-resources.sh > "${gcp_resources_after}" ${gcp_list_resources_script} > "${gcp_resources_after}"
fi fi
fi fi