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

Merge pull request #16012 from kubernetes/revert-14854-revert-14824-fix-jenkins

Browse Source 
Revert "Revert "Fix 'flock' command in hack/jenkins/e2e.sh""
This commit is contained in:
Marek Grabowski 2015-10-21 08:38:55 +02:00
commit 62c82e6e9a
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
hack/jenkins/e2e.sh
View File

@ -1076,13 +1076,13 @@ if [[ "${E2E_UP,,}" == "true" || "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; the
# gcloud bug can cause racing component updates to stomp on each # gcloud bug can cause racing component updates to stomp on each
# other. # other.
export KUBE_SKIP_UPDATE=y export KUBE_SKIP_UPDATE=y
{ (
sudo flock -x -n 9 flock -x -n 9
gcloud components update -q || true sudo gcloud components update -q || true
gcloud components update preview -q || true sudo gcloud components update preview -q || true
gcloud components update alpha -q || true sudo gcloud components update alpha -q || true
gcloud components update beta -q || true sudo gcloud components update beta -q || true
} 9>/var/run/lock/gcloud-components.lock ) 9>/var/run/lock/gcloud-components.lock
if [[ ! -z ${JENKINS_EXPLICIT_VERSION:-} ]]; then if [[ ! -z ${JENKINS_EXPLICIT_VERSION:-} ]]; then
# Use an explicit pinned version like "ci/v0.10.0-101-g6c814c4" or # Use an explicit pinned version like "ci/v0.10.0-101-g6c814c4" or