Browse Source

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

changes/80/650380/2
Zuul 1 month ago
parent
commit
ee4aa495c7
1 changed files with 7 additions and 2 deletions
  1. 7
    2
      tools/apply-test.sh

+ 7
- 2
tools/apply-test.sh View File

@@ -49,8 +49,13 @@ fi
49 49
 FOUND=0
50 50
 for f in `find applytest -name 'puppetapplytest*' -print` ; do
51 51
     if grep -q "Node-OS: $CODENAME" $f; then
52
-        cat applytest/head $f > $f.final
53
-        FOUND=1
52
+        if grep -q "Puppet-Version: !${PUPPET_VERSION}" $f; then
53
+            echo "Skipping $f due to unsupported puppet version"
54
+            continue
55
+        else
56
+            cat applytest/head $f > $f.final
57
+            FOUND=1
58
+        fi
54 59
     fi
55 60
 done
56 61
 

Loading…
Cancel
Save