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

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

Revert "Fix 'flock' command in hack/jenkins/e2e.sh"
pull/6/head
Brendan Burns 2015-09-30 12:27:13 -07:00
parent ae5355ee55 40bb24d692
commit bd8ee1c4c4
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

@ -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