From 325f6c061beb2721cb55777e206922d728f62e69 Mon Sep 17 00:00:00 2001 From: N Date: Thu, 19 Mar 2020 12:45:35 +0000 Subject: [PATCH 1/3] fix(jinja): replace version_cmp with grains lookup --- salt/formulas.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/formulas.sls b/salt/formulas.sls index 9427a3a..506b769 100644 --- a/salt/formulas.sls +++ b/salt/formulas.sls @@ -34,7 +34,7 @@ {%- do processed_basedirs.append(basedir) %} {{ basedir }}: file.directory: - - parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }} + - parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }} {%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts', {'makedirs': True}).items() %} - {{ key }}: {{ value }} From b7d323f878860f3a9b8cdaed5f09ea23e283f316 Mon Sep 17 00:00:00 2001 From: N Date: Thu, 19 Mar 2020 13:05:46 +0000 Subject: [PATCH 2/3] chore(unittest): update suse pkg version --- test/integration/v201902-py3/controls/pkgs_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/v201902-py3/controls/pkgs_spec.rb b/test/integration/v201902-py3/controls/pkgs_spec.rb index ffe2dca..42be5f2 100644 --- a/test/integration/v201902-py3/controls/pkgs_spec.rb +++ b/test/integration/v201902-py3/controls/pkgs_spec.rb @@ -12,7 +12,7 @@ version = when 'fedora' '2019.2.1rc0-3.fc31' when 'suse' - '2019.2.0-lp151.5.9.1' + '2019.2.0-lp151.5.12.1' when 'debian' '2019.2.3+ds-1' end From dd37869d2842927a87273b940fd76945ff6a05ec Mon Sep 17 00:00:00 2001 From: N Date: Thu, 19 Mar 2020 13:16:00 +0000 Subject: [PATCH 3/3] fix(jinja): replace version_cmp with grains lookup --- salt/formulas.sls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/salt/formulas.sls b/salt/formulas.sls index 506b769..7731d14 100644 --- a/salt/formulas.sls +++ b/salt/formulas.sls @@ -54,7 +54,7 @@ {{ gitdir_env }}: git.latest: - name: {{ baseurl }}/{{ f_name }}.git - - parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }} + - parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }} - target: {{ gitdir }} {%- for key, value in options.items() %} - {{ key }}: {{ value }}