Skip to content

Commit 13e00e0

Browse files
committed
Limited the containers tested on, and skip git testing till Salt requirements fixed
1 parent ba0a5f2 commit 13e00e0

File tree

2 files changed

+13
-60
lines changed

2 files changed

+13
-60
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -180,51 +180,6 @@ jobs:
180180

181181

182182

183-
amazonlinux-2:
184-
name: Amazon 2
185-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
186-
uses: ./.github/workflows/test-linux.yml
187-
needs:
188-
- lint
189-
- generate-actions-workflow
190-
with:
191-
distro-slug: amazonlinux-2
192-
display-name: Amazon 2
193-
container-slug: systemd-amazonlinux-2
194-
timeout: 20
195-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
196-
197-
198-
amazonlinux-2023:
199-
name: Amazon 2023
200-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
201-
uses: ./.github/workflows/test-linux.yml
202-
needs:
203-
- lint
204-
- generate-actions-workflow
205-
with:
206-
distro-slug: amazonlinux-2023
207-
display-name: Amazon 2023
208-
container-slug: systemd-amazonlinux-2023
209-
timeout: 20
210-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
211-
212-
213-
debian-11:
214-
name: Debian 11
215-
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
216-
uses: ./.github/workflows/test-linux.yml
217-
needs:
218-
- lint
219-
- generate-actions-workflow
220-
with:
221-
distro-slug: debian-11
222-
display-name: Debian 11
223-
container-slug: systemd-debian-11
224-
timeout: 20
225-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
226-
227-
228183
debian-12:
229184
name: Debian 12
230185
if: github.event_name == 'push' || needs.collect-changed-files.outputs.run-tests == 'true'
@@ -237,7 +192,7 @@ jobs:
237192
display-name: Debian 12
238193
container-slug: systemd-debian-12
239194
timeout: 20
240-
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
195+
instances: '["stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
241196

242197

243198
photon-5:
@@ -282,7 +237,7 @@ jobs:
282237
display-name: Rocky Linux 9
283238
container-slug: systemd-rockylinux-9
284239
timeout: 20
285-
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "git-master", "latest", "default"]'
240+
instances: '["stable-3006", "onedir-3006", "stable-3006-8", "stable-3007", "onedir-3007", "stable-3007-1", "latest", "default"]'
286241

287242

288243
ubuntu-2204:
@@ -312,9 +267,6 @@ jobs:
312267
- macos-13
313268
- macos-14
314269
- windows-2022
315-
- amazonlinux-2
316-
- amazonlinux-2023
317-
- debian-11
318270
- debian-12
319271
- photon-5
320272
- rockylinux-8

.github/workflows/templates/generate.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@
88

99
# only test against current containers with systemd
1010
# will add these when they become available with systemd
11+
# "amazonlinux-2",
12+
# "amazonlinux-2023",
13+
# "debian-11",
1114
# "debian-12",
1215
# "debian-13",
1316
# "fedora-40",
1417
# "photon-4",
1518
# "ubuntu-2004",
1619
# "ubuntu-2404",
1720
LINUX_DISTROS = [
18-
"amazonlinux-2",
19-
"amazonlinux-2023",
20-
"debian-11",
2121
"debian-12",
2222
"photon-5",
2323
"rockylinux-8",
@@ -37,15 +37,15 @@
3737

3838
# only test against current containers with systemd
3939
# will add these when they become available with systemd
40+
# "amazonlinux-2",
41+
# "amazonlinux-2023",
42+
# "debian-11",
4043
# "debian-13",
4144
# "fedora-40",
4245
# "photon-4",
4346
# "ubuntu-2004",
4447
# "ubuntu-2404",
4548
STABLE_DISTROS = [
46-
"amazonlinux-2",
47-
"amazonlinux-2023",
48-
"debian-11",
4949
"debian-12",
5050
"photon-5",
5151
"rockylinux-8",
@@ -55,15 +55,15 @@
5555

5656
# only test against current containers with systemd
5757
# will add these when they become available with systemd
58+
# "amazonlinux-2",
59+
# "amazonlinux-2023",
60+
# "debian-11",
5861
# "debian-13",
5962
# "fedora-40",
6063
# "photon-4",
6164
# "ubuntu-2004",
6265
# "ubuntu-2404",
6366
ONEDIR_DISTROS = [
64-
"amazonlinux-2",
65-
"amazonlinux-2023",
66-
"debian-11",
6767
"debian-12",
6868
"photon-5",
6969
"rockylinux-8",
@@ -126,15 +126,16 @@
126126
"ubuntu-2404",
127127
]
128128

129-
## "rockylinux-9",
130129
BLACKLIST_GIT_MASTER = [
131130
"amazonlinux-2",
132131
"amazonlinux-2023",
133132
"debian-11",
133+
"debian-12",
134134
"debian-13",
135135
"fedora-40",
136136
"photon-4",
137137
"photon-5",
138+
"rockylinux-9",
138139
]
139140

140141
SALT_VERSIONS = [

0 commit comments

Comments
 (0)