github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19265 from spxtr/clean-logs 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-01-04 20:31:18 -08:00
parent e0eac06f64 c8faf0b1f2
commit 8f4d801368
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,7 @@
set -o errexit
set -o nounset
set -o pipefail
set -o xtrace
echo "--------------------------------------------------------------------------------"
echo "Test Environment:"
@ -67,7 +68,10 @@ if [[ "${E2E_UP,,}" == "true" || "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; the
# At this point, we want to have the following vars set:
# - bucket
# - build_version
gsutil -m cp gs://kubernetes-release/${bucket}/${build_version}/kubernetes.tar.gz gs://kubernetes-release/${bucket}/${build_version}/kubernetes-test.tar.gz .
gsutil -mq cp \
"gs://kubernetes-release/${bucket}/${build_version}/kubernetes.tar.gz" \
"gs://kubernetes-release/${bucket}/${build_version}/kubernetes-test.tar.gz" \
.
# Set by GKE-CI to change the CLUSTER_API_VERSION to the git version
if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then

1
hack/jenkins/e2e.sh
View File

@ -20,7 +20,6 @@
set -o errexit
set -o nounset
set -o pipefail
set -o xtrace
# Join all args with |
# Example: join_regex_allow_empty a b "c d" e => a|b|c d|e