feat(use_tofs): use legacy setting to avoid managing/removing files

myii · Oct 2, 2020 · f0c9018 · f0c9018
1 parent bdce42d
commit f0c9018
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/ssf/config/formulas.sls b/ssf/config/formulas.sls
@@ -86,6 +86,10 @@ prepare-git-branch-for-{{ formula }}:
 {%-           endif %}
 {%-         endif %}
 {%-         set dest = '{0}/{1}/{2}'.format(ssf.formulas_path, formula, dest_file) %}
+{#-         Take advantage of `dest_file_done` to avoid managing/removing legacy TOFS files #}
+{%-         if (semrel_file in ['docs/TOFS_pattern.rst', 'formula/libtofs.jinja'] and use_tofs == 'legacy') %}
+{%-           do dest_file_done.append(dest_file) %}
+{%-         endif %}
 {#-         Only run the states for each suite if the same template is being used for each file (in each suite) #}
 {#-         Furthermore, only continue if the `dest_file` has actually been set #}
 {%-         if dest_file and dest_file not in dest_file_done %}

diff --git a/ssf/formulas.yaml b/ssf/formulas.yaml
@@ -4864,9 +4864,9 @@ ssf:
           - [amazonlinux  ,   2   ,   3000.3,      3,         default]
           - [fedora       ,  31   ,   2019.2,      3,         default]
           - [arch-base    , latest,   2019.2,      2,         default]
-      #   # Enable this in a subsequent PR, since it's an old version,
-      #   # which is already active (needs to be checked for regressions)
-      #   use_tofs: true
+        # TODO: Upgrade to latest TOFS in a subsequent PR, since a legacy version
+        # is active for the time being (needs to be checked for regressions)
+        use_tofs: legacy
       semrel_files: *semrel_files_default
     vault:
       context: