Skip to content

Commit a041b9c

Browse files
committed
1 parent d10c5ae commit a041b9c

File tree

3 files changed

+56
-17
lines changed

3 files changed

+56
-17
lines changed

ssf/defaults.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@ ssf_node_anchors:
99
branch:
1010
# TODO: `base` can be removed in favour of `github:remote:upstream:branch`
1111
base: master
12-
pr: chore/local-use-only-to-push-to-main-branch
12+
pr: chore/standardise-structure
1313
upstream: upstream
1414
commit:
1515
# NOTE: The version number in the `body` is automatically updated during the
1616
# release phase via. `pre-commit_semantic-release.sh`
1717
# An alternative method could be to use:
1818
# `git describe --abbrev=0 --tags`
1919
# yamllint disable rule:line-length
20-
title: 'ci(kitchen): change `log_level` to `debug` instead of `info`'
21-
body: '* Automated using https://github.com/myii/ssf-formula/pull/41'
20+
title: 'ci(platform): add `arch-base-latest`'
21+
body: '* Automated using https://github.com/myii/ssf-formula/pull/40'
2222
# yamllint enable rule:line-length
2323
github:
2424
owner: saltstack-formulas
@@ -55,6 +55,7 @@ ssf_node_anchors:
5555
- suse
5656
- freebsd
5757
- amazon
58+
- arch
5859
provisioner:
5960
dependencies: []
6061
# Structure assumes `top.sls:base`
@@ -87,30 +88,35 @@ ssf_node_anchors:
8788
- [fedora , 30 , develop, 3]
8889
- [opensuse/leap, 15 , develop, 3]
8990
- [amazonlinux , 2 , develop, 2]
91+
- [arch-base , latest, develop, 2]
9092
- [debian , 9 , 2019.2, 3]
9193
- [ubuntu , 18.04, 2019.2, 3]
9294
- [centos , 7 , 2019.2, 3]
9395
- [fedora , 30 , 2019.2, 3]
9496
- [opensuse/leap, 15 , 2019.2, 3]
9597
- [amazonlinux , 2 , 2019.2, 2]
98+
- [arch-base , latest, 2019.2, 2]
9699
- [debian , 9 , 2018.3, 2]
97100
- [ubuntu , 16.04, 2018.3, 2]
98101
- [centos , 7 , 2018.3, 2]
99102
- [fedora , 29 , 2018.3, 2]
100103
- [opensuse/leap, 15 , 2018.3, 2]
101104
- [amazonlinux , 2 , 2018.3, 2]
105+
- [arch-base , latest, 2018.3, 2]
102106
- [debian , 8 , 2017.7, 2]
103107
- [ubuntu , 16.04, 2017.7, 2]
104108
- [centos , 6 , 2017.7, 2]
105109
- [fedora , 29 , 2017.7, 2]
106110
- [opensuse/leap, 15 , 2017.7, 2]
107111
- [amazonlinux , 2 , 2017.7, 2]
112+
- [arch-base , latest, 2017.7, 2]
108113
platforms_matrix:
109114
# Comments in `platforms` apply here, too
110115
# [os , os_ver, salt_ver, py_ver, inspec_suite]
111116
- [debian , 10 , develop, 3, default]
112117
- [ubuntu , 18.04, 2019.2, 3, default]
113118
- [amazonlinux , 2 , 2019.2, 2, default]
119+
- [arch-base , latest, 2019.2, 2, default]
114120
- [fedora , 29 , 2018.3, 2, default]
115121
- [opensuse/leap, 15 , 2018.3, 2, default]
116122
- [centos , 6 , 2017.7, 2, default]

ssf/files/default/kitchen.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ platforms:
125125
{%- endif %}
126126
{%- endif %}
127127
{#- TODO: Should really do this whole `if` block from `defaults.yaml` or `formulas.yaml`, just speeding things up right now #}
128-
{%- if os == 'opensuse/leap' %}
129-
{%- if semrel_formula == 'deepsea' and salt_ver != 'develop' %}
128+
{%- if os in ['opensuse/leap', 'arch-base'] %}
129+
{%- if os == 'opensuse/leap' and semrel_formula == 'deepsea' and salt_ver != 'develop' %}
130130
{#- Duplicated `provision_command` due to `deepsea`, try to remove eventually #}
131131
provision_command:
132132
- zypper -n in tar gzip

0 commit comments

Comments
 (0)