Skip to content
This repository
Browse code

OS-1586 Lockfile naming doesn't allow for concurrent builds

  • Loading branch information...
commit 2833bc072fc2f53b4127222e0f9081c04bab606d 1 parent 087b162
Robert Mustacchi rmustacc authored

Showing 1 changed file with 3 additions and 5 deletions. Show diff stats Hide diff stats

  1. +3 5 configure
8 configure
@@ -235,6 +235,8 @@ fi
235 235 [[ $ENABLE_DEBUG -eq 1 ]] && NIGHTLY_EXTRA=$NIGHTLY_EXTRA"D"
236 236 [[ $ENABLE_DEBUG -eq 2 ]] && NIGHTLY_EXTRA=$NIGHTLY_EXTRA"DF"
237 237
  238 +LOCKUNIQ=$(echo ${ROOT} | tr / _)
  239 +
238 240 cat <<EOF> illumos.sh
239 241 NIGHTLY_OPTIONS="$NIGHTLY_OPTIONS_BASE$NIGHTLY_EXTRA"; export NIGHTLY_OPTIONS
240 242 GATE="${RELEASE_VER}"; export GATE
@@ -252,11 +254,7 @@ export CLONE_WS
252 254 STAFFER=nobody; export STAFFER
253 255 MAILTO=$STAFFER; export MAILTO
254 256 BUILD_PROJECT=; export BUILD_PROJECT
255   -if [[ -z "${HUDSON_SERVER_COOKIE}" ]]; then
256   -LOCKNAME="\`whoami\`_\`basename \$CODEMGR_WS\`_nightly.lock"; export LOCKNAME
257   -else
258   -LOCKNAME="\`whoami\`_\`basename \$CODEMGR_WS\`_nightly-${HUDSON_SERVER_COOKIE}.lock"; export LOCKNAME
259   -fi
  257 +LOCKNAME="\`whoami\`_${LOCKUNIQ}_nightly.lock"; export LOCKNAME
260 258 ATLOG="\$CODEMGR_WS/log"; export ATLOG
261 259 LOGFILE="\$ATLOG/nightly.log"; export LOGFILE
262 260 MACH=\`uname -p\`; export MACH

0 comments on commit 2833bc0

Please sign in to comment.
Something went wrong with that request. Please try again.