Skip to content

Commit 82a1dd0

Browse files
silverhadchsilverhadch
authored
Merge branch 'containers:main' into kde-kontainer
2 parents cbebd11 + a61b85c commit 82a1dd0

File tree

5 files changed

+57
-40
lines changed

5 files changed

+57
-40
lines changed

‎.github/workflows/ubuntu-tests.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,7 @@ jobs:
161161
test/system/108-completion.bats \
162162
test/system/201-ipc.bats \
163163
test/system/203-network.bats \
164+
test/system/210-ulimit.bats \
164165
test/system/220-environment-variables.bats \
165166
test/system/230-cdi.bats \
166167
test/system/250-kerberos.bats \

‎playbooks/dependencies-fedora.yaml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,22 @@
3939
- udisks2
4040
use: "{{ 'dnf' if zuul.attempts > 1 else 'auto' }}"
4141

42+
- name: Ensure subordinate ID ranges exist for zuul-worker
43+
become: true
44+
lineinfile:
45+
create: true
46+
path: "{{ item.file }}"
47+
regexp: "^zuul-worker:"
48+
line: "zuul-worker:524288:65536"
49+
with_items:
50+
- { file: /etc/subgid }
51+
- { file: /etc/subuid }
52+
53+
- name: Force Podman to refresh user namespace mappings
54+
become: true
55+
command: podman system migrate
56+
ignore_errors: true
57+
4258
- name: Ensure that 'p11-kit server' is absent
4359
become: yes
4460
package:

‎src/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ go 1.22.0
44

55
require (
66
github.com/HarryMichal/go-version v1.0.1
7-
github.com/NVIDIA/go-nvlib v0.7.1
7+
github.com/NVIDIA/go-nvlib v0.7.2
88
github.com/NVIDIA/go-nvml v0.12.4-1
9-
github.com/NVIDIA/nvidia-container-toolkit v1.17.5
9+
github.com/NVIDIA/nvidia-container-toolkit v1.17.8
1010
github.com/acobaugh/osrelease v0.1.0
1111
github.com/briandowns/spinner v1.23.2
1212
github.com/docker/go-units v0.5.0

‎src/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym
5151
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
5252
github.com/HarryMichal/go-version v1.0.1 h1:Vgk1dPyHckkoUu0AED900+yO43+uwDuiNPsdpYe63KE=
5353
github.com/HarryMichal/go-version v1.0.1/go.mod h1:UNoJ+GvCcmwu0F9Mu1u5y56lP5rWksgkiwLlGx3r+Pk=
54-
github.com/NVIDIA/go-nvlib v0.7.1 h1:7HHPZxoCjSLm1NgaRRjuhI8ffMCpc5Vgpg5yxQYUff8=
55-
github.com/NVIDIA/go-nvlib v0.7.1/go.mod h1:2Kh2kYSP5IJ8EKf0/SYDzHiQKb9EJkwOf2LQzu6pXzY=
54+
github.com/NVIDIA/go-nvlib v0.7.2 h1:7sy/NVUa4sM9FLKwH6CjBfHSWrJUmv8emVyxLTzjfOA=
55+
github.com/NVIDIA/go-nvlib v0.7.2/go.mod h1:2Kh2kYSP5IJ8EKf0/SYDzHiQKb9EJkwOf2LQzu6pXzY=
5656
github.com/NVIDIA/go-nvml v0.12.4-1 h1:WKUvqshhWSNTfm47ETRhv0A0zJyr1ncCuHiXwoTrBEc=
5757
github.com/NVIDIA/go-nvml v0.12.4-1/go.mod h1:8Llmj+1Rr+9VGGwZuRer5N/aCjxGuR5nPb/9ebBiIEQ=
58-
github.com/NVIDIA/nvidia-container-toolkit v1.17.5 h1:aIE12dFRAG4xAp00vHoh9O1JL8onuldwMrX/GNSZy9Q=
59-
github.com/NVIDIA/nvidia-container-toolkit v1.17.5/go.mod h1:UQcbm+GRu+Dwmeyqtwq2HDa57Xq82zzQsmUusidtndM=
58+
github.com/NVIDIA/nvidia-container-toolkit v1.17.8 h1:ndE23TKvQBicsZT88mzZudygn6JNOe6+UsIgqk6gGvw=
59+
github.com/NVIDIA/nvidia-container-toolkit v1.17.8/go.mod h1:khOgMW80+g8eX/1zPlO4demLShHht9I0YEm8ngcPgwk=
6060
github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
6161
github.com/acobaugh/osrelease v0.1.0 h1:Yb59HQDGGNhCj4suHaFQQfBps5wyoKLSSX/J/+UifRE=
6262
github.com/acobaugh/osrelease v0.1.0/go.mod h1:4bFEs0MtgHNHBrmHCt67gNisnabCRAlzdVasCEGHTWY=

‎test/system/210-ulimit.bats‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ teardown_file() {
3838
local limit
3939
limit=$(ulimit -H -R)
4040

41-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -R
41+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -R'
4242

4343
assert_success
4444
assert_line --index 0 "$limit"
@@ -53,7 +53,7 @@ teardown_file() {
5353
local limit
5454
limit=$(ulimit -S -R)
5555

56-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -R
56+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -R'
5757

5858
assert_success
5959
assert_line --index 0 "$limit"
@@ -68,7 +68,7 @@ teardown_file() {
6868
local limit
6969
limit=$(ulimit -H -c)
7070

71-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -c
71+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -c'
7272

7373
assert_success
7474
assert_line --index 0 "$limit"
@@ -83,7 +83,7 @@ teardown_file() {
8383
local limit
8484
limit=$(ulimit -S -c)
8585

86-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -c
86+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -c'
8787

8888
assert_success
8989
assert_line --index 0 "$limit"
@@ -98,7 +98,7 @@ teardown_file() {
9898
local limit
9999
limit=$(ulimit -H -d)
100100

101-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -d
101+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -d'
102102

103103
assert_success
104104
assert_line --index 0 "$limit"
@@ -113,7 +113,7 @@ teardown_file() {
113113
local limit
114114
limit=$(ulimit -S -d)
115115

116-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -d
116+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -d'
117117

118118
assert_success
119119
assert_line --index 0 "$limit"
@@ -128,7 +128,7 @@ teardown_file() {
128128
local limit
129129
limit=$(ulimit -H -e)
130130

131-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -e
131+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -e'
132132

133133
assert_success
134134
assert_line --index 0 "$limit"
@@ -143,7 +143,7 @@ teardown_file() {
143143
local limit
144144
limit=$(ulimit -S -e)
145145

146-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -e
146+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -e'
147147

148148
assert_success
149149
assert_line --index 0 "$limit"
@@ -158,7 +158,7 @@ teardown_file() {
158158
local limit
159159
limit=$(ulimit -H -f)
160160

161-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -f
161+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -f'
162162

163163
assert_success
164164
assert_line --index 0 "$limit"
@@ -173,7 +173,7 @@ teardown_file() {
173173
local limit
174174
limit=$(ulimit -S -f)
175175

176-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -f
176+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -f'
177177

178178
assert_success
179179
assert_line --index 0 "$limit"
@@ -188,7 +188,7 @@ teardown_file() {
188188
local limit
189189
limit=$(ulimit -H -i)
190190

191-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -i
191+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -i'
192192

193193
assert_success
194194
assert_line --index 0 "$limit"
@@ -203,7 +203,7 @@ teardown_file() {
203203
local limit
204204
limit=$(ulimit -S -i)
205205

206-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -i
206+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -i'
207207

208208
assert_success
209209
assert_line --index 0 "$limit"
@@ -218,7 +218,7 @@ teardown_file() {
218218
local limit
219219
limit=$(ulimit -H -l)
220220

221-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -l
221+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -l'
222222

223223
assert_success
224224
assert_line --index 0 "$limit"
@@ -233,7 +233,7 @@ teardown_file() {
233233
local limit
234234
limit=$(ulimit -S -l)
235235

236-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -l
236+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -l'
237237

238238
assert_success
239239
assert_line --index 0 "$limit"
@@ -248,7 +248,7 @@ teardown_file() {
248248
local limit
249249
limit=$(ulimit -H -m)
250250

251-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -m
251+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -m'
252252

253253
assert_success
254254
assert_line --index 0 "$limit"
@@ -263,7 +263,7 @@ teardown_file() {
263263
local limit
264264
limit=$(ulimit -S -m)
265265

266-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -m
266+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -m'
267267

268268
assert_success
269269
assert_line --index 0 "$limit"
@@ -278,7 +278,7 @@ teardown_file() {
278278
local limit
279279
limit=$(ulimit -H -n)
280280

281-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -n
281+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -n'
282282

283283
assert_success
284284
assert_line --index 0 "$limit"
@@ -293,7 +293,7 @@ teardown_file() {
293293
local limit
294294
limit=$(ulimit -H -n)
295295

296-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -n
296+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -n'
297297

298298
assert_success
299299
assert_line --index 0 "$limit"
@@ -308,7 +308,7 @@ teardown_file() {
308308
local limit
309309
limit=$(ulimit -H -p)
310310

311-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -p
311+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -p'
312312

313313
assert_success
314314
assert_line --index 0 "$limit"
@@ -323,7 +323,7 @@ teardown_file() {
323323
local limit
324324
limit=$(ulimit -S -p)
325325

326-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -p
326+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -p'
327327

328328
assert_success
329329
assert_line --index 0 "$limit"
@@ -338,7 +338,7 @@ teardown_file() {
338338
local limit
339339
limit=$(ulimit -H -q)
340340

341-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -q
341+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -q'
342342

343343
assert_success
344344
assert_line --index 0 "$limit"
@@ -353,7 +353,7 @@ teardown_file() {
353353
local limit
354354
limit=$(ulimit -S -q)
355355

356-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -q
356+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -q'
357357

358358
assert_success
359359
assert_line --index 0 "$limit"
@@ -368,7 +368,7 @@ teardown_file() {
368368
local limit
369369
limit=$(ulimit -H -r)
370370

371-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -r
371+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -r'
372372

373373
assert_success
374374
assert_line --index 0 "$limit"
@@ -383,7 +383,7 @@ teardown_file() {
383383
local limit
384384
limit=$(ulimit -S -r)
385385

386-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -r
386+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -r'
387387

388388
assert_success
389389
assert_line --index 0 "$limit"
@@ -398,7 +398,7 @@ teardown_file() {
398398
local limit
399399
limit=$(ulimit -H -s)
400400

401-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -s
401+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -s'
402402

403403
assert_success
404404
assert_line --index 0 "$limit"
@@ -413,7 +413,7 @@ teardown_file() {
413413
local limit
414414
limit=$(ulimit -S -s)
415415

416-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -s
416+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -s'
417417

418418
assert_success
419419
assert_line --index 0 "$limit"
@@ -428,7 +428,7 @@ teardown_file() {
428428
local limit
429429
limit=$(ulimit -H -t)
430430

431-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -t
431+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -t'
432432

433433
assert_success
434434
assert_line --index 0 "$limit"
@@ -443,7 +443,7 @@ teardown_file() {
443443
local limit
444444
limit=$(ulimit -S -t)
445445

446-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -t
446+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -t'
447447

448448
assert_success
449449
assert_line --index 0 "$limit"
@@ -458,7 +458,7 @@ teardown_file() {
458458
local limit
459459
limit=$(ulimit -H -u)
460460

461-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -u
461+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -u'
462462

463463
assert_success
464464
assert_line --index 0 "$limit"
@@ -473,7 +473,7 @@ teardown_file() {
473473
local limit
474474
limit=$(ulimit -S -u)
475475

476-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -u
476+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -u'
477477

478478
assert_success
479479
assert_line --index 0 "$limit"
@@ -488,7 +488,7 @@ teardown_file() {
488488
local limit
489489
limit=$(ulimit -H -v)
490490

491-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -v
491+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -v'
492492

493493
assert_success
494494
assert_line --index 0 "$limit"
@@ -503,7 +503,7 @@ teardown_file() {
503503
local limit
504504
limit=$(ulimit -S -v)
505505

506-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -v
506+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -v'
507507

508508
assert_success
509509
assert_line --index 0 "$limit"
@@ -518,7 +518,7 @@ teardown_file() {
518518
local limit
519519
limit=$(ulimit -H -x)
520520

521-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -x
521+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -x'
522522

523523
assert_success
524524
assert_line --index 0 "$limit"
@@ -533,7 +533,7 @@ teardown_file() {
533533
local limit
534534
limit=$(ulimit -S -x)
535535

536-
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -x
536+
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -x'
537537

538538
assert_success
539539
assert_line --index 0 "$limit"

0 commit comments

Comments
 (0)