Merge branch 'ps-build' into ps-2.4-stable

Author: erthink

ps-build.sh

@@ -29,7 +29,7 @@ echo "BUILD_NUMBER: $BUILD_NUMBER"
 echo "PREFIX: $PREFIX"
 
 git fetch origin --prune --tags || failure "git fetch"
-BUILD_ID=$(git describe --abbrev=15 --always --long --tags | sed "s/^.\+-\([0-9]\+-g[0-9a-f]\+\)\$/.${BUILD_NUMBER}-\1/")
+BUILD_ID=$(git describe --abbrev=15 --always --long --tags | sed -e "s/^.\+-\([0-9]\+-g[0-9a-f]\+\)\$/.${BUILD_NUMBER}-\1/" -e "s/^\([0-9a-f]\+\)\$/.${BUILD_NUMBER}-g\1/")$(git show --abbrev=15 --format=-t%t | head -n 1)
 echo "BUILD_ID: $BUILD_ID"
 
 step_finish "prepare"

ps/ps-ci-test.sh

@@ -19,6 +19,8 @@ function find_free_port {
 		local h=$((l+n-1))
 		if [ $h -gt 65535 ]; then continue; fi
 		if [ $h -ge $begin -a $h -lt $end ]; then continue; fi
+		# LY: skip default ports to avoid conflicts with local 'make test'
+		if [ $l -ge 9010 -a $h -lt 9017 ]; then continue; fi
 		local r=$l
 		for p in $(seq $l $h); do
 			if netstat -ant | sed -e '/^tcp/ !d' -e 's/^[^ ]* *[^ ]* *[^ ]* *.*[\.:]\([0-9]*\) .*$/\1/' | grep -q -w $p; then