opendev/system-config
Code Issues Proposed changes

Merge "Add Puppet-Version: !X skip to apply tests"

Browse Source
This commit is contained in:
Zuul 2019-04-16 23:53:10 +00:00 committed by Gerrit Code Review
commit ee4aa495c7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/apply-test.sh
View File

@ -49,9 +49,14 @@ fi
FOUND=0 FOUND=0
for f in `find applytest -name 'puppetapplytest*' -print` ; do for f in `find applytest -name 'puppetapplytest*' -print` ; do
if grep -q "Node-OS: $CODENAME" $f; then if grep -q "Node-OS: $CODENAME" $f; then
if grep -q "Puppet-Version: !${PUPPET_VERSION}" $f; then
echo "Skipping $f due to unsupported puppet version"
continue
else
cat applytest/head $f > $f.final cat applytest/head $f > $f.final
FOUND=1 FOUND=1
fi fi
fi
done done
if [[ $FOUND == "0" ]]; then if [[ $FOUND == "0" ]]; then