Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

  • Loading branch information...
commit 2833bc072fc2f53b4127222e0f9081c04bab606d 1 parent 087b162
@rmustacc rmustacc authored
Showing with 3 additions and 5 deletions.
  1. +3 −5 configure
View
8 configure
@@ -235,6 +235,8 @@ fi
[[ $ENABLE_DEBUG -eq 1 ]] && NIGHTLY_EXTRA=$NIGHTLY_EXTRA"D"
[[ $ENABLE_DEBUG -eq 2 ]] && NIGHTLY_EXTRA=$NIGHTLY_EXTRA"DF"
+LOCKUNIQ=$(echo ${ROOT} | tr / _)
+
cat <<EOF> illumos.sh
NIGHTLY_OPTIONS="$NIGHTLY_OPTIONS_BASE$NIGHTLY_EXTRA"; export NIGHTLY_OPTIONS
GATE="${RELEASE_VER}"; export GATE
@@ -252,11 +254,7 @@ export CLONE_WS
STAFFER=nobody; export STAFFER
MAILTO=$STAFFER; export MAILTO
BUILD_PROJECT=; export BUILD_PROJECT
-if [[ -z "${HUDSON_SERVER_COOKIE}" ]]; then
-LOCKNAME="\`whoami\`_\`basename \$CODEMGR_WS\`_nightly.lock"; export LOCKNAME
-else
-LOCKNAME="\`whoami\`_\`basename \$CODEMGR_WS\`_nightly-${HUDSON_SERVER_COOKIE}.lock"; export LOCKNAME
-fi
+LOCKNAME="\`whoami\`_${LOCKUNIQ}_nightly.lock"; export LOCKNAME
ATLOG="\$CODEMGR_WS/log"; export ATLOG
LOGFILE="\$ATLOG/nightly.log"; export LOGFILE
MACH=\`uname -p\`; export MACH
Please sign in to comment.
Something went wrong with that request. Please try again.