github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7993 from saad-ali/jenkinssoak2

Browse Source 
Modify Jenkins E2E to not fetch/unpack Kuberenetes, when deployment is disabled
This commit is contained in:
Quinton Hoole
2015-05-11 14:20:39 -07:00
parent 8b3130b112 94643ce6c9
commit 04c90565c0
1 changed files with 74 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hack/jenkins/e2e.sh
View File

@@ -97,6 +97,7 @@ export E2E_UP="${E2E_UP:-true}"
export E2E_TEST="${E2E_TEST:-true}" export E2E_TEST="${E2E_TEST:-true}"
export E2E_DOWN="${E2E_DOWN:-true}" export E2E_DOWN="${E2E_DOWN:-true}"
if [[ "${E2E_UP,,}" == "true" ]]; then
if [[ ${KUBE_RUN_FROM_OUTPUT:-} =~ ^[yY]$ ]]; then if [[ ${KUBE_RUN_FROM_OUTPUT:-} =~ ^[yY]$ ]]; then
echo "Found KUBE_RUN_FROM_OUTPUT=y; will use binaries from _output" echo "Found KUBE_RUN_FROM_OUTPUT=y; will use binaries from _output"
cp _output/release-tars/kubernetes*.tar.gz . cp _output/release-tars/kubernetes*.tar.gz .
@@ -162,7 +163,6 @@ fi
md5sum kubernetes*.tar.gz md5sum kubernetes*.tar.gz
tar -xzf kubernetes.tar.gz tar -xzf kubernetes.tar.gz
tar -xzf kubernetes-test.tar.gz tar -xzf kubernetes-test.tar.gz
cd kubernetes
# Set by GKE-CI to change the CLUSTER_API_VERSION to the git version # Set by GKE-CI to change the CLUSTER_API_VERSION to the git version
if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then if [[ ! -z ${E2E_SET_CLUSTER_API_VERSION:-} ]]; then
@@ -171,6 +171,9 @@ elif [[ ${JENKINS_USE_RELEASE_TARS:-} =~ ^[yY]$ ]]; then
release=$(gsutil cat gs://kubernetes-release/release/${version_file}.txt | cut -c 2-) release=$(gsutil cat gs://kubernetes-release/release/${version_file}.txt | cut -c 2-)
export CLUSTER_API_VERSION=${release} export CLUSTER_API_VERSION=${release}
fi fi
fi
cd kubernetes
# Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml # Have cmd/e2e run by goe2e.sh generate JUnit report in ${WORKSPACE}/junit*.xml
export E2E_REPORT_DIR=${WORKSPACE} export E2E_REPORT_DIR=${WORKSPACE}