From 40bb24d69217d457fc89f66dfcb0cfac96c53b56 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Wed, 30 Sep 2015 12:27:02 -0700 Subject: [PATCH] Revert "Fix 'flock' command in hack/jenkins/e2e.sh" --- hack/jenkins/e2e.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/hack/jenkins/e2e.sh b/hack/jenkins/e2e.sh index b2f7b14eaa..403632be64 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -624,13 +624,13 @@ if [[ "${E2E_UP,,}" == "true" || "${JENKINS_FORCE_GET_TARS:-}" =~ ^[yY]$ ]]; the # gcloud bug can cause racing component updates to stomp on each # other. export KUBE_SKIP_UPDATE=y - ( - flock -x -n 9 - sudo gcloud components update -q || true - sudo gcloud components update preview -q || true - sudo gcloud components update alpha -q || true - sudo gcloud components update beta -q || true - ) 9>/var/run/lock/gcloud-components.lock + { + sudo flock -x -n 9 + gcloud components update -q || true + gcloud components update preview -q || true + gcloud components update alpha -q || true + gcloud components update beta -q || true + } 9>/var/run/lock/gcloud-components.lock if [[ ! -z ${JENKINS_EXPLICIT_VERSION:-} ]]; then # Use an explicit pinned version like "ci/v0.10.0-101-g6c814c4" or