vpp_config: update node variants to skx and icl

[vpp.git] / src / scripts / fts.py

diff --git a/src/scripts/fts.py b/src/scripts/fts.py
index f5ac4d8..2499704 100755 (executable)
--- a/src/scripts/fts.py
+++ b/src/scripts/fts.py
@@ -58,7 +58,7 @@ schema = {
 
 def filelist_from_git_status():
     filelist = []
-    git_status = 'git status --porcelain */FEATURE.yaml'
+    git_status = 'git status --porcelain */FEATURE*.yaml'
     rv = run(git_status.split(), stdout=PIPE, stderr=PIPE)
     if rv.returncode != 0:
         sys.exit(rv.returncode)
@@ -71,7 +71,7 @@ def filelist_from_git_status():
 
 def filelist_from_git_ls():
     filelist = []
-    git_ls = 'git ls-files :(top)*/FEATURE.yaml'
+    git_ls = 'git ls-files :(top)*/FEATURE*.yaml'
     rv = run(git_ls.split(), stdout=PIPE, stderr=PIPE)
     if rv.returncode != 0:
         sys.exit(rv.returncode)
@@ -248,12 +248,12 @@ def main():
         featurefile = featurefile.rstrip()
 
         # Load configuration file
-        with open(featurefile) as f:
+        with open(featurefile, encoding='utf-8') as f:
             cfg = yaml.load(f, Loader=yaml.SafeLoader)
         try:
             validate(instance=cfg, schema=schema)
         except exceptions.ValidationError:
-            print('File does not validate: {featurefile}',
+            print(f'File does not validate: {featurefile}',
                   file=sys.stderr)
             raise
         features[featurefile] = cfg