Browse Source
Merge pull request #460 from noelmcloughlin/version_cmp
fix(jinja): replace version_cmp with grains lookuptags/v1.3.1
Imran Iqbal
4 years ago
2 changed files with 3 additions and 3 deletions
+ 2
- 2
salt/formulas.sls
View File
| {%- do processed_basedirs.append(basedir) %} | {%- do processed_basedirs.append(basedir) %} | ||||
| {{ basedir }}: | {{ basedir }}: | ||||
| file.directory: | 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', | {%- for key, value in salt['pillar.get']('salt_formulas:basedir_opts', | ||||
| {'makedirs': True}).items() %} | {'makedirs': True}).items() %} | ||||
| - {{ key }}: {{ value }} | - {{ key }}: {{ value }} | ||||
| {{ gitdir_env }}: | {{ gitdir_env }}: | ||||
| git.latest: | git.latest: | ||||
| - name: {{ baseurl }}/{{ f_name }}.git | - name: {{ baseurl }}/{{ f_name }}.git | ||||
| - parallel: {{ salt.pkg.version_cmp(grains['saltversion'], '2017.7.0') >= 0 }} | |||||
| - parallel: {{ grains['saltversioninfo'] >= [2017, 7, 0] }} | |||||
| - target: {{ gitdir }} | - target: {{ gitdir }} | ||||
| {%- for key, value in options.items() %} | {%- for key, value in options.items() %} | ||||
| - {{ key }}: {{ value }} | - {{ key }}: {{ value }} |
+ 1
- 1
test/integration/v201902-py3/controls/pkgs_spec.rb
View File
| when 'fedora' | when 'fedora' | ||||
| '2019.2.1rc0-3.fc31' | '2019.2.1rc0-3.fc31' | ||||
| when 'suse' | when 'suse' | ||||
| '2019.2.0-lp151.5.9.1' | |||||
| '2019.2.0-lp151.5.12.1' | |||||
| when 'debian' | when 'debian' | ||||
| '2019.2.3+ds-1' | '2019.2.3+ds-1' | ||||
| end | end |
Loading…