From a5bedd4cf4ce718631e263aca97c07340ec97f9e Mon Sep 17 00:00:00 2001 From: Marek Grabowski Date: Wed, 21 Oct 2015 08:36:07 +0200 Subject: [PATCH] Revert "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 82dbddbb37b..005b69d27c5 100755 --- a/hack/jenkins/e2e.sh +++ b/hack/jenkins/e2e.sh @@ -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 # other. export KUBE_SKIP_UPDATE=y - { - 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 + ( + 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 if [[ ! -z ${JENKINS_EXPLICIT_VERSION:-} ]]; then # Use an explicit pinned version like "ci/v0.10.0-101-g6c814c4" or