opendev
/
system-config
Code Issues Proposed changes

Merge "Run puppet apply test serially on centos"

This commit is contained in:
Zuul 2018-10-08 16:38:39 +00:00 committed by Gerrit Code Review
parent e9d4430fa5 f9e18bc348
commit 38b9e983c5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/apply-test.sh
View File

@ -69,8 +69,16 @@ sudo mkdir -p /var/run/puppet
echo "Running apply test primer to avoid setup races when run in parallel."
./tools/test_puppet_apply.sh applytest/primer.pp
THREADS=$(nproc)
if grep -qi centos /etc/os-release ; then
# Single thread on centos to workaround a race with rsync on centos
# when copying puppet modules for multiple puppet applies at the same
# time.
THREADS=1
fi
echo "Running apply test on these hosts:"
find applytest -name 'puppetapplytest*.final' -print0
find applytest -name 'puppetapplytest*.final' -print0 | \
xargs -0 -P $(nproc) -n 1 -I filearg \
xargs -0 -P $THREADS -n 1 -I filearg \
./tools/test_puppet_apply.sh filearg