Skip to content

Commit 10abdda

Browse files
SJrXSteve Ramage
SJrX
and
Steve Ramage
authored
ci: remove tests that were causing failing builds due to removal of cgroupv1 options in systemd (#353)
Co-authored-by: Steve Ramage <[email protected]>
1 parent 2688cec commit 10abdda

File tree

4 files changed

+9
-364
lines changed

4 files changed

+9
-364
lines changed

‎buildSrc/src/main/groovy/GenerateDataFromManPages.groovy‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ class GenerateDataFromManPages extends DefaultTask {
6767
['sections':
6868
['Options': ['Service']]
6969
],
70+
'systemd.slice.xml':
71+
['sections':
72+
['Options': ['Slice']]
73+
],
7074
'systemd.timer.xml' :
7175
['sections':
7276
['Options': ['Timer']]

‎src/main/resources/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/undocumentedSectionToKeywordMap.json‎

Lines changed: 0 additions & 225 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,5 @@
11
{
22
"Mount": {
3-
"BlockIOAccounting": {
4-
"reason": "moved",
5-
"replacedWithKey": "IOAccounting",
6-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
7-
},
8-
"BlockIODeviceWeight": {
9-
"reason": "moved",
10-
"replacedWithKey": "IODeviceWeight",
11-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
12-
},
13-
"BlockIOReadBandwidth": {
14-
"reason": "moved",
15-
"replacedWithKey": "IOReadBandwidthMax",
16-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
17-
},
18-
"BlockIOWeight": {
19-
"reason": "moved",
20-
"replacedWithKey": "IOWeight",
21-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
22-
},
23-
"BlockIOWriteBandwidth": {
24-
"reason": "moved",
25-
"replacedWithKey": "IOWriteBandwidthMax",
26-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
27-
},
28-
"CPUShares": {
29-
"reason": "moved",
30-
"replacedWithKey": "CPUWeight",
31-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
32-
},
333
"DefaultMemoryLow": {
344
"reason": "manual",
355
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -45,11 +15,6 @@
4515
"replacedWithKey": "InaccessiblePath",
4616
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
4717
},
48-
"MemoryLimit": {
49-
"reason": "moved",
50-
"replacedWithKey": "MemoryMax",
51-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
52-
},
5318
"ReadOnlyDirectories": {
5419
"reason": "moved",
5520
"replacedWithKey": "ReadOnlyPaths",
@@ -59,49 +24,9 @@
5924
"reason": "moved",
6025
"replacedWithKey": "ReadWritePaths",
6126
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
62-
},
63-
"StartupBlockIOWeight": {
64-
"reason": "moved",
65-
"replacedWithKey": "StartupIOWeight",
66-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
67-
},
68-
"StartupCPUShares": {
69-
"reason": "moved",
70-
"replacedWithKey": "StartupCPUWeight",
71-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
7227
}
7328
},
7429
"Service": {
75-
"BlockIOAccounting": {
76-
"reason": "moved",
77-
"replacedWithKey": "IOAccounting",
78-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
79-
},
80-
"BlockIODeviceWeight": {
81-
"reason": "moved",
82-
"replacedWithKey": "IODeviceWeight",
83-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
84-
},
85-
"BlockIOReadBandwidth": {
86-
"reason": "moved",
87-
"replacedWithKey": "IOReadBandwidthMax",
88-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
89-
},
90-
"BlockIOWeight": {
91-
"reason": "moved",
92-
"replacedWithKey": "IOWeight",
93-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
94-
},
95-
"BlockIOWriteBandwidth": {
96-
"reason": "moved",
97-
"replacedWithKey": "IOWriteBandwidthMax",
98-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
99-
},
100-
"CPUShares": {
101-
"reason": "moved",
102-
"replacedWithKey": "CPUWeight",
103-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
104-
},
10530
"DefaultMemoryLow": {
10631
"reason": "manual",
10732
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -122,11 +47,6 @@
12247
"replacedWithKey": "InaccessiblePath",
12348
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
12449
},
125-
"MemoryLimit": {
126-
"reason": "moved",
127-
"replacedWithKey": "MemoryMax",
128-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
129-
},
13050
"PermissionsStartOnly": {
13151
"reason": "unsupported",
13252
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L561"
@@ -161,49 +81,9 @@
16181
"reason": "moved",
16282
"replacedWithSection": "Unit",
16383
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L3443"
164-
},
165-
"StartupBlockIOWeight": {
166-
"reason": "moved",
167-
"replacedWithKey": "StartupIOWeight",
168-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
169-
},
170-
"StartupCPUShares": {
171-
"reason": "moved",
172-
"replacedWithKey": "StartupCPUWeight",
173-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
17484
}
17585
},
17686
"Slice": {
177-
"BlockIOAccounting": {
178-
"reason": "moved",
179-
"replacedWithKey": "IOAccounting",
180-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
181-
},
182-
"BlockIODeviceWeight": {
183-
"reason": "moved",
184-
"replacedWithKey": "IODeviceWeight",
185-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
186-
},
187-
"BlockIOReadBandwidth": {
188-
"reason": "moved",
189-
"replacedWithKey": "IOReadBandwidthMax",
190-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
191-
},
192-
"BlockIOWeight": {
193-
"reason": "moved",
194-
"replacedWithKey": "IOWeight",
195-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
196-
},
197-
"BlockIOWriteBandwidth": {
198-
"reason": "moved",
199-
"replacedWithKey": "IOWriteBandwidthMax",
200-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
201-
},
202-
"CPUShares": {
203-
"reason": "moved",
204-
"replacedWithKey": "CPUWeight",
205-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
206-
},
20787
"DefaultMemoryLow": {
20888
"reason": "manual",
20989
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -213,54 +93,9 @@
21393
"reason": "manual",
21494
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryMin=bytes",
21595
"description": "<p><var>DefaultMemoryMin=</var> controls the 'memory.min' value of children. This setting has the same semantics as <var>MemoryMin=</var>. For details about this control attribute see <a href='https://www.kernel.org/doc/Documentation/cgroup-v2.txt'>cgroup-v2.txt</a></p>"
216-
},
217-
"MemoryLimit": {
218-
"reason": "moved",
219-
"replacedWithKey": "MemoryMax",
220-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
221-
},
222-
"StartupBlockIOWeight": {
223-
"reason": "moved",
224-
"replacedWithKey": "StartupIOWeight",
225-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
226-
},
227-
"StartupCPUShares": {
228-
"reason": "moved",
229-
"replacedWithKey": "StartupCPUWeight",
230-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
23196
}
23297
},
23398
"Socket": {
234-
"BlockIOAccounting": {
235-
"reason": "moved",
236-
"replacedWithKey": "IOAccounting",
237-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
238-
},
239-
"BlockIODeviceWeight": {
240-
"reason": "moved",
241-
"replacedWithKey": "IODeviceWeight",
242-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
243-
},
244-
"BlockIOReadBandwidth": {
245-
"reason": "moved",
246-
"replacedWithKey": "IOReadBandwidthMax",
247-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
248-
},
249-
"BlockIOWeight": {
250-
"reason": "moved",
251-
"replacedWithKey": "IOWeight",
252-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
253-
},
254-
"BlockIOWriteBandwidth": {
255-
"reason": "moved",
256-
"replacedWithKey": "IOWriteBandwidthMax",
257-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
258-
},
259-
"CPUShares": {
260-
"reason": "moved",
261-
"replacedWithKey": "CPUWeight",
262-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
263-
},
26499
"DefaultMemoryLow": {
265100
"reason": "manual",
266101
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -276,11 +111,6 @@
276111
"replacedWithKey": "InaccessiblePath",
277112
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
278113
},
279-
"MemoryLimit": {
280-
"reason": "moved",
281-
"replacedWithKey": "MemoryMax",
282-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
283-
},
284114
"ReadOnlyDirectories": {
285115
"reason": "moved",
286116
"replacedWithKey": "ReadOnlyPaths",
@@ -290,49 +120,9 @@
290120
"reason": "moved",
291121
"replacedWithKey": "ReadWritePaths",
292122
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
293-
},
294-
"StartupBlockIOWeight": {
295-
"reason": "moved",
296-
"replacedWithKey": "StartupIOWeight",
297-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
298-
},
299-
"StartupCPUShares": {
300-
"reason": "moved",
301-
"replacedWithKey": "StartupCPUWeight",
302-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
303123
}
304124
},
305125
"Swap": {
306-
"BlockIOAccounting": {
307-
"reason": "moved",
308-
"replacedWithKey": "IOAccounting",
309-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
310-
},
311-
"BlockIODeviceWeight": {
312-
"reason": "moved",
313-
"replacedWithKey": "IODeviceWeight",
314-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
315-
},
316-
"BlockIOReadBandwidth": {
317-
"reason": "moved",
318-
"replacedWithKey": "IOReadBandwidthMax",
319-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
320-
},
321-
"BlockIOWeight": {
322-
"reason": "moved",
323-
"replacedWithKey": "IOWeight",
324-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
325-
},
326-
"BlockIOWriteBandwidth": {
327-
"reason": "moved",
328-
"replacedWithKey": "IOWriteBandwidthMax",
329-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
330-
},
331-
"CPUShares": {
332-
"reason": "moved",
333-
"replacedWithKey": "CPUWeight",
334-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
335-
},
336126
"DefaultMemoryLow": {
337127
"reason": "manual",
338128
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -348,11 +138,6 @@
348138
"replacedWithKey": "InaccessiblePath",
349139
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
350140
},
351-
"MemoryLimit": {
352-
"reason": "moved",
353-
"replacedWithKey": "MemoryMax",
354-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
355-
},
356141
"ReadOnlyDirectories": {
357142
"reason": "moved",
358143
"replacedWithKey": "ReadOnlyPaths",
@@ -362,16 +147,6 @@
362147
"reason": "moved",
363148
"replacedWithKey": "ReadWritePaths",
364149
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
365-
},
366-
"StartupBlockIOWeight": {
367-
"reason": "moved",
368-
"replacedWithKey": "StartupIOWeight",
369-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
370-
},
371-
"StartupCPUShares": {
372-
"reason": "moved",
373-
"replacedWithKey": "StartupCPUWeight",
374-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
375150
}
376151
},
377152
"Unit": {

‎src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/documentation/UnitFileDocumentationProviderTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class UnitFileDocumentationProviderTest : AbstractUnitFileTest() {
7878
// Fixture Setup
7979
val file = """
8080
[Service]
81-
BlockIOAccounting=true
81+
FailureAction=true
8282
""".trimIndent()
8383
val psiFile = setupFileInEditor("file.service", file)
8484

@@ -87,7 +87,7 @@ class UnitFileDocumentationProviderTest : AbstractUnitFileTest() {
8787
val urls = sut.getUrlFor(documentationKeySeparator, documentationKeySeparator)
8888

8989
// Verification
90-
TestCase.assertEquals(listOf("https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="), urls)
90+
TestCase.assertEquals(listOf("https://github.com/systemd/systemd/commit/53c35a766f"), urls)
9191
}
9292

9393
fun testGetUrlForUnknownSectionReturnsAnEmptyListOfUrls() {

0 commit comments

Comments
 (0)