feat(template): improve reusability

* saltstack-formulas/template-formula#180 * saltstack-formulas/template-formula#183
myii · Dec 23, 2019 · 491791c · 491791c
1 parent 0fcd836
commit 491791c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/ssf/defaults.yaml b/ssf/defaults.yaml
@@ -22,8 +22,8 @@ ssf_node_anchors:
             #       An alternative method could be to use:
             #       `git describe --abbrev=0 --tags`
             # yamllint disable rule:line-length
-            title: 'ci(travis): use `major.minor` for `semantic-release` version [skip ci]'
-            body: '* Automated using https://github.com/myii/ssf-formula/pull/112'
+            title: 'feat: improve reusability'
+            body: '* Checked using https://github.com/myii/ssf-formula/pull/113'
             # yamllint enable rule:line-length
           github:
             owner: 'saltstack-formulas'

diff --git a/ssf/files/default/.rubocop.yml b/ssf/files/default/.rubocop.yml
@@ -27,6 +27,9 @@ AllCops:
 {%- endif %}
 
 # Any offenses that should be fixed, e.g. collected via. `rubocop --auto-gen-config`
+{%- if semrel_formula == 'template' %}
+# <REMOVEME
+{%- endif %}
 {%- for cop, config in rubocop.Cops.items() if cop not in [MLL] %}
 {{ cop }}:
   {#- This is purposefully simplistic for the time being,
@@ -35,3 +38,6 @@ AllCops:
   {{ k }}: {{ v }}
   {%- endfor %}
 {%- endfor %}
+{%- if semrel_formula == 'template' %}
+# REMOVEME>
+{%- endif %}
diff --git a/ssf/files/default/.travis.yml b/ssf/files/default/.travis.yml
@@ -184,6 +184,22 @@ jobs:
     {{- format_ci_matrix(platforms, inspec_suites_kitchen, inspec_suites_matrix, platforms_matrix, platforms_matrix_commented_includes, semrel_formula, use_new_travis_format=True) }}
     {%- endif %}
 
+    {%- if semrel_formula == 'template' %}
+    # <REMOVEME
+
+    # Test the conversion of `template-formula` into another formula
+    # ready for development
+    - env: 'Conversion'
+      name: 'Test: bin/convert-formula.sh'
+      script:
+        - git clone . tmp/converted-formula
+        - cd tmp/converted-formula
+        - DEBUG=true bin/convert-formula.sh converted
+        - '[ $(git rev-list HEAD --count) -eq 2 ]'
+        - bin/kitchen verify default-debian-10-2019-2-py3
+    # REMOVEME>
+    {%- endif %}
+
     ## Define the release stage that runs `semantic-release`
     - stage: 'release'
       language: 'node_js'