Skip to content

Commit f11470c

Browse files
alxwralxwr
committed
feat: add FreeBSD and Debian 10 support
1 parent 08e3593 commit f11470c

33 files changed

+493
-269
lines changed

‎.gitlab-ci.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -126,25 +126,25 @@ rubocop:
126126
# the `platforms` defined in `kitchen.yml`
127127
default-debian-10-tiamat-py3: {extends: '.test_instance'}
128128
# default-debian-9-tiamat-py3: {extends: '.test_instance'}
129-
default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
129+
# default-ubuntu-2004-tiamat-py3: {extends: '.test_instance'}
130130
# default-ubuntu-1804-tiamat-py3: {extends: '.test_instance'}
131131
# default-ubuntu-1604-tiamat-py3: {extends: '.test_instance'}
132-
default-centos-8-tiamat-py3: {extends: '.test_instance'}
132+
# default-centos-8-tiamat-py3: {extends: '.test_instance'}
133133
# default-centos-7-tiamat-py3: {extends: '.test_instance'}
134-
default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
135-
default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
134+
# default-amazonlinux-2-tiamat-py3: {extends: '.test_instance'}
135+
# default-oraclelinux-8-tiamat-py3: {extends: '.test_instance'}
136136
# default-oraclelinux-7-tiamat-py3: {extends: '.test_instance'}
137-
# default-debian-10-master-py3: {extends: '.test_instance'}
137+
default-debian-10-master-py3: {extends: '.test_instance'}
138138
# default-ubuntu-2004-master-py3: {extends: '.test_instance'}
139139
# default-ubuntu-1804-master-py3: {extends: '.test_instance'}
140140
# default-centos-8-master-py3: {extends: '.test_instance'}
141-
default-fedora-32-master-py3: {extends: '.test_instance'}
141+
# default-fedora-32-master-py3: {extends: '.test_instance'}
142142
# default-fedora-31-master-py3: {extends: '.test_instance'}
143-
default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
143+
# default-opensuse-leap-152-master-py3: {extends: '.test_instance'}
144144
# default-amazonlinux-2-master-py3: {extends: '.test_instance'}
145-
gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
146-
gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
147-
# default-debian-10-3001-py3: {extends: '.test_instance'}
145+
# gentoo-gentoo-stage3-latest-master-py3: {extends: '.test_instance'}
146+
# gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
147+
default-debian-10-3001-py3: {extends: '.test_instance'}
148148
# default-debian-9-3001-py3: {extends: '.test_instance'}
149149
# default-ubuntu-2004-3001-py3: {extends: '.test_instance'}
150150
# default-ubuntu-1804-3001-py3: {extends: '.test_instance'}
@@ -158,7 +158,7 @@ gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
158158
# default-oraclelinux-7-3001-py3: {extends: '.test_instance'}
159159
# gentoo-gentoo-stage3-latest-3001-py3: {extends: '.test_instance'}
160160
# gentoo-gentoo-stage3-systemd-3001-py3: {extends: '.test_instance'}
161-
# default-debian-10-3000-3-py3: {extends: '.test_instance'}
161+
default-debian-10-3000-3-py3: {extends: '.test_instance'}
162162
# default-debian-9-3000-3-py3: {extends: '.test_instance'}
163163
# default-ubuntu-1804-3000-3-py3: {extends: '.test_instance'}
164164
# default-centos-8-3000-3-py3: {extends: '.test_instance'}
@@ -170,9 +170,9 @@ gentoo-gentoo-stage3-systemd-master-py3: {extends: '.test_instance'}
170170
# gentoo-gentoo-stage3-systemd-3000-3-py3: {extends: '.test_instance'}
171171
# default-ubuntu-1804-3000-3-py2: {extends: '.test_instance'}
172172
# default-ubuntu-1604-3000-3-py2: {extends: '.test_instance'}
173-
default-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
173+
# default-arch-base-latest-3000-3-py2: {extends: '.test_instance'}
174174
# upstart-centos-6-2019-2-py2: {extends: '.test_instance'}
175-
upstart-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
175+
# upstart-amazonlinux-1-2019-2-py2: {extends: '.test_instance'}
176176

177177
###############################################################################
178178
# `release` stage: `semantic-release`

‎.travis.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -96,25 +96,25 @@ jobs:
9696
# Ref: https://github.com/saltstack-formulas/template-formula/issues/121
9797
- env: INSTANCE=default-debian-10-tiamat-py3
9898
# - env: INSTANCE=default-debian-9-tiamat-py3
99-
- env: INSTANCE=default-ubuntu-2004-tiamat-py3
99+
# - env: INSTANCE=default-ubuntu-2004-tiamat-py3
100100
# - env: INSTANCE=default-ubuntu-1804-tiamat-py3
101101
# - env: INSTANCE=default-ubuntu-1604-tiamat-py3
102-
- env: INSTANCE=default-centos-8-tiamat-py3
102+
# - env: INSTANCE=default-centos-8-tiamat-py3
103103
# - env: INSTANCE=default-centos-7-tiamat-py3
104-
- env: INSTANCE=default-amazonlinux-2-tiamat-py3
105-
- env: INSTANCE=default-oraclelinux-8-tiamat-py3
104+
# - env: INSTANCE=default-amazonlinux-2-tiamat-py3
105+
# - env: INSTANCE=default-oraclelinux-8-tiamat-py3
106106
# - env: INSTANCE=default-oraclelinux-7-tiamat-py3
107-
# - env: INSTANCE=default-debian-10-master-py3
107+
- env: INSTANCE=default-debian-10-master-py3
108108
# - env: INSTANCE=default-ubuntu-2004-master-py3
109109
# - env: INSTANCE=default-ubuntu-1804-master-py3
110110
# - env: INSTANCE=default-centos-8-master-py3
111-
- env: INSTANCE=default-fedora-32-master-py3
111+
# - env: INSTANCE=default-fedora-32-master-py3
112112
# - env: INSTANCE=default-fedora-31-master-py3
113-
- env: INSTANCE=default-opensuse-leap-152-master-py3
113+
# - env: INSTANCE=default-opensuse-leap-152-master-py3
114114
# - env: INSTANCE=default-amazonlinux-2-master-py3
115-
- env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3
116-
- env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
117-
# - env: INSTANCE=default-debian-10-3001-py3
115+
# - env: INSTANCE=gentoo-gentoo-stage3-latest-master-py3
116+
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-master-py3
117+
- env: INSTANCE=default-debian-10-3001-py3
118118
# - env: INSTANCE=default-debian-9-3001-py3
119119
# - env: INSTANCE=default-ubuntu-2004-3001-py3
120120
# - env: INSTANCE=default-ubuntu-1804-3001-py3
@@ -128,7 +128,7 @@ jobs:
128128
# - env: INSTANCE=default-oraclelinux-7-3001-py3
129129
# - env: INSTANCE=gentoo-gentoo-stage3-latest-3001-py3
130130
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3001-py3
131-
# - env: INSTANCE=default-debian-10-3000-3-py3
131+
- env: INSTANCE=default-debian-10-3000-3-py3
132132
# - env: INSTANCE=default-debian-9-3000-3-py3
133133
# - env: INSTANCE=default-ubuntu-1804-3000-3-py3
134134
# - env: INSTANCE=default-centos-8-3000-3-py3
@@ -140,9 +140,9 @@ jobs:
140140
# - env: INSTANCE=gentoo-gentoo-stage3-systemd-3000-3-py3
141141
# - env: INSTANCE=default-ubuntu-1804-3000-3-py2
142142
# - env: INSTANCE=default-ubuntu-1604-3000-3-py2
143-
- env: INSTANCE=default-arch-base-latest-3000-3-py2
143+
# - env: INSTANCE=default-arch-base-latest-3000-3-py2
144144
# - env: INSTANCE=upstart-centos-6-2019-2-py2
145-
- env: INSTANCE=upstart-amazonlinux-1-2019-2-py2
145+
# - env: INSTANCE=upstart-amazonlinux-1-2019-2-py2
146146

147147
## Define the release stage that runs `semantic-release`
148148
- stage: 'release'

‎debian/backports/init.sls‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{%- set oscodename = grains['oscodename'] %}
2+
3+
debian-backports-pkgrepo-managed:
4+
pkgrepo.managed:
5+
- humanname: {{ oscodename }} backports
6+
- name: deb http://deb.debian.org/debian {{ oscodename }}-backports
7+
- comps: main,contrib,non-free
8+
- file: /etc/apt/sources.list.d/{{ oscodename }}-backports.list
9+
- enabled: True
10+
- clean_file: True
11+
{%- if oscodename == 'buster' and 'wireguard' in salt['pillar.get']('features', {}) %}
12+
- require_in:
13+
- pkg: wireguard-package-install-pkg-installed
14+
{%- endif %}

0 commit comments

Comments
 (0)