Skip to content

Commit 054ef35

Browse files
author
Steve Ramage
committed
ci: remove tests that were causing failing builds due to removal of cgroupv1 options in systemd
1 parent 4305894 commit 054ef35

File tree

7 files changed

+17
-741
lines changed

7 files changed

+17
-741
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,11 @@ class GenerateDataFromManPages extends DefaultTask {
7373
['sections':
7474
['Options': ['Service']]
7575
],
76-
'systemd.timer.xml' :
76+
'systemd.slice.xml':
77+
['sections':
78+
['Options': ['Slice']]
79+
],
80+
'systemd.timer.xml' :
7781
['sections':
7882
['Options': ['Timer']]
7983
],

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

Lines changed: 7 additions & 225 deletions
Original file line numberDiff line numberDiff line change
@@ -214,36 +214,6 @@
214214
},
215215
"unit": {
216216
"Mount": {
217-
"BlockIOAccounting": {
218-
"reason": "moved",
219-
"replacedWithKey": "IOAccounting",
220-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
221-
},
222-
"BlockIODeviceWeight": {
223-
"reason": "moved",
224-
"replacedWithKey": "IODeviceWeight",
225-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
226-
},
227-
"BlockIOReadBandwidth": {
228-
"reason": "moved",
229-
"replacedWithKey": "IOReadBandwidthMax",
230-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
231-
},
232-
"BlockIOWeight": {
233-
"reason": "moved",
234-
"replacedWithKey": "IOWeight",
235-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
236-
},
237-
"BlockIOWriteBandwidth": {
238-
"reason": "moved",
239-
"replacedWithKey": "IOWriteBandwidthMax",
240-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
241-
},
242-
"CPUShares": {
243-
"reason": "moved",
244-
"replacedWithKey": "CPUWeight",
245-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
246-
},
247217
"DefaultMemoryLow": {
248218
"reason": "manual",
249219
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -259,11 +229,6 @@
259229
"replacedWithKey": "InaccessiblePath",
260230
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
261231
},
262-
"MemoryLimit": {
263-
"reason": "moved",
264-
"replacedWithKey": "MemoryMax",
265-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
266-
},
267232
"ReadOnlyDirectories": {
268233
"reason": "moved",
269234
"replacedWithKey": "ReadOnlyPaths",
@@ -273,49 +238,10 @@
273238
"reason": "moved",
274239
"replacedWithKey": "ReadWritePaths",
275240
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
276-
},
277-
"StartupBlockIOWeight": {
278-
"reason": "moved",
279-
"replacedWithKey": "StartupIOWeight",
280-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
281-
},
282-
"StartupCPUShares": {
283-
"reason": "moved",
284-
"replacedWithKey": "StartupCPUWeight",
285-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
286241
}
242+
287243
},
288244
"Service": {
289-
"BlockIOAccounting": {
290-
"reason": "moved",
291-
"replacedWithKey": "IOAccounting",
292-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
293-
},
294-
"BlockIODeviceWeight": {
295-
"reason": "moved",
296-
"replacedWithKey": "IODeviceWeight",
297-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
298-
},
299-
"BlockIOReadBandwidth": {
300-
"reason": "moved",
301-
"replacedWithKey": "IOReadBandwidthMax",
302-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
303-
},
304-
"BlockIOWeight": {
305-
"reason": "moved",
306-
"replacedWithKey": "IOWeight",
307-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
308-
},
309-
"BlockIOWriteBandwidth": {
310-
"reason": "moved",
311-
"replacedWithKey": "IOWriteBandwidthMax",
312-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
313-
},
314-
"CPUShares": {
315-
"reason": "moved",
316-
"replacedWithKey": "CPUWeight",
317-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
318-
},
319245
"DefaultMemoryLow": {
320246
"reason": "manual",
321247
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -335,11 +261,7 @@
335261
"reason": "moved",
336262
"replacedWithKey": "InaccessiblePath",
337263
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
338-
},
339-
"MemoryLimit": {
340-
"reason": "moved",
341-
"replacedWithKey": "MemoryMax",
342-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
264+
343265
},
344266
"PermissionsStartOnly": {
345267
"reason": "unsupported",
@@ -375,49 +297,10 @@
375297
"reason": "moved",
376298
"replacedWithSection": "Unit",
377299
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L3443"
378-
},
379-
"StartupBlockIOWeight": {
380-
"reason": "moved",
381-
"replacedWithKey": "StartupIOWeight",
382-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
383-
},
384-
"StartupCPUShares": {
385-
"reason": "moved",
386-
"replacedWithKey": "StartupCPUWeight",
387-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
388300
}
301+
389302
},
390303
"Slice": {
391-
"BlockIOAccounting": {
392-
"reason": "moved",
393-
"replacedWithKey": "IOAccounting",
394-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
395-
},
396-
"BlockIODeviceWeight": {
397-
"reason": "moved",
398-
"replacedWithKey": "IODeviceWeight",
399-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
400-
},
401-
"BlockIOReadBandwidth": {
402-
"reason": "moved",
403-
"replacedWithKey": "IOReadBandwidthMax",
404-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
405-
},
406-
"BlockIOWeight": {
407-
"reason": "moved",
408-
"replacedWithKey": "IOWeight",
409-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
410-
},
411-
"BlockIOWriteBandwidth": {
412-
"reason": "moved",
413-
"replacedWithKey": "IOWriteBandwidthMax",
414-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
415-
},
416-
"CPUShares": {
417-
"reason": "moved",
418-
"replacedWithKey": "CPUWeight",
419-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
420-
},
421304
"DefaultMemoryLow": {
422305
"reason": "manual",
423306
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -427,54 +310,10 @@
427310
"reason": "manual",
428311
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryMin=bytes",
429312
"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>"
430-
},
431-
"MemoryLimit": {
432-
"reason": "moved",
433-
"replacedWithKey": "MemoryMax",
434-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
435-
},
436-
"StartupBlockIOWeight": {
437-
"reason": "moved",
438-
"replacedWithKey": "StartupIOWeight",
439-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
440-
},
441-
"StartupCPUShares": {
442-
"reason": "moved",
443-
"replacedWithKey": "StartupCPUWeight",
444-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
445313
}
314+
446315
},
447316
"Socket": {
448-
"BlockIOAccounting": {
449-
"reason": "moved",
450-
"replacedWithKey": "IOAccounting",
451-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
452-
},
453-
"BlockIODeviceWeight": {
454-
"reason": "moved",
455-
"replacedWithKey": "IODeviceWeight",
456-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
457-
},
458-
"BlockIOReadBandwidth": {
459-
"reason": "moved",
460-
"replacedWithKey": "IOReadBandwidthMax",
461-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
462-
},
463-
"BlockIOWeight": {
464-
"reason": "moved",
465-
"replacedWithKey": "IOWeight",
466-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
467-
},
468-
"BlockIOWriteBandwidth": {
469-
"reason": "moved",
470-
"replacedWithKey": "IOWriteBandwidthMax",
471-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
472-
},
473-
"CPUShares": {
474-
"reason": "moved",
475-
"replacedWithKey": "CPUWeight",
476-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
477-
},
478317
"DefaultMemoryLow": {
479318
"reason": "manual",
480319
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -489,11 +328,7 @@
489328
"reason": "moved",
490329
"replacedWithKey": "InaccessiblePath",
491330
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
492-
},
493-
"MemoryLimit": {
494-
"reason": "moved",
495-
"replacedWithKey": "MemoryMax",
496-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
331+
497332
},
498333
"ReadOnlyDirectories": {
499334
"reason": "moved",
@@ -504,49 +339,10 @@
504339
"reason": "moved",
505340
"replacedWithKey": "ReadWritePaths",
506341
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
507-
},
508-
"StartupBlockIOWeight": {
509-
"reason": "moved",
510-
"replacedWithKey": "StartupIOWeight",
511-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
512-
},
513-
"StartupCPUShares": {
514-
"reason": "moved",
515-
"replacedWithKey": "StartupCPUWeight",
516-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
517342
}
343+
518344
},
519345
"Swap": {
520-
"BlockIOAccounting": {
521-
"reason": "moved",
522-
"replacedWithKey": "IOAccounting",
523-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOAccounting="
524-
},
525-
"BlockIODeviceWeight": {
526-
"reason": "moved",
527-
"replacedWithKey": "IODeviceWeight",
528-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIODeviceWeight=device%20weight"
529-
},
530-
"BlockIOReadBandwidth": {
531-
"reason": "moved",
532-
"replacedWithKey": "IOReadBandwidthMax",
533-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
534-
},
535-
"BlockIOWeight": {
536-
"reason": "moved",
537-
"replacedWithKey": "IOWeight",
538-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
539-
},
540-
"BlockIOWriteBandwidth": {
541-
"reason": "moved",
542-
"replacedWithKey": "IOWriteBandwidthMax",
543-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOReadBandwidth=device%20bytes"
544-
},
545-
"CPUShares": {
546-
"reason": "moved",
547-
"replacedWithKey": "CPUWeight",
548-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
549-
},
550346
"DefaultMemoryLow": {
551347
"reason": "manual",
552348
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLow=bytes",
@@ -562,11 +358,6 @@
562358
"replacedWithKey": "InaccessiblePath",
563359
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
564360
},
565-
"MemoryLimit": {
566-
"reason": "moved",
567-
"replacedWithKey": "MemoryMax",
568-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#MemoryLimit=bytes"
569-
},
570361
"ReadOnlyDirectories": {
571362
"reason": "moved",
572363
"replacedWithKey": "ReadOnlyPaths",
@@ -576,16 +367,7 @@
576367
"reason": "moved",
577368
"replacedWithKey": "ReadWritePaths",
578369
"documentationLink": "https://github.com/systemd/systemd/blob/v241/NEWS#L2799"
579-
},
580-
"StartupBlockIOWeight": {
581-
"reason": "moved",
582-
"replacedWithKey": "StartupIOWeight",
583-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#BlockIOWeight=weight"
584-
},
585-
"StartupCPUShares": {
586-
"reason": "moved",
587-
"replacedWithKey": "StartupCPUWeight",
588-
"documentationLink": "https://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#CPUShares=weight"
370+
589371
}
590372
},
591373
"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)