Merge branch 'containers:main' into feature/container-create-extras

This commit is contained in:
Ray Miller 2025-07-26 11:06:18 +01:00 committed by GitHub
commit f3c2b7631b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 61 additions and 43 deletions

View File

@ -45,7 +45,7 @@ jobs:
flatpak \
gcc \
go-md2man \
golang-1.21 \
golang-1.22 \
meson \
ninja-build \
openssl \
@ -58,9 +58,9 @@ jobs:
- name: Ensure that 'p11-kit server' is absent
run: sudo rm /usr/libexec/p11-kit/p11-kit-server
- name: Set up PATH for Go 1.21
- name: Set up PATH for Go 1.22
run: |
echo "PATH=/usr/lib/go-1.21/bin:$PATH" >> "$GITHUB_ENV"
echo "PATH=/usr/lib/go-1.22/bin:$PATH" >> "$GITHUB_ENV"
- name: Checkout Bats
uses: actions/checkout@v4
@ -161,7 +161,9 @@ jobs:
test/system/108-completion.bats \
test/system/201-ipc.bats \
test/system/203-network.bats \
test/system/210-ulimit.bats \
test/system/220-environment-variables.bats \
test/system/230-cdi.bats \
test/system/250-kerberos.bats \
test/system/270-rpm.bats \
test/system/501-create.bats \

View File

@ -39,6 +39,22 @@
- udisks2
use: "{{ 'dnf' if zuul.attempts > 1 else 'auto' }}"
- name: Ensure subordinate ID ranges exist for zuul-worker
become: true
lineinfile:
create: true
path: "{{ item.file }}"
regexp: "^zuul-worker:"
line: "zuul-worker:524288:65536"
with_items:
- { file: /etc/subgid }
- { file: /etc/subuid }
- name: Force Podman to refresh user namespace mappings
become: true
command: podman system migrate
ignore_errors: true
- name: Ensure that 'p11-kit server' is absent
become: yes
package:

View File

@ -4,9 +4,9 @@ go 1.22.0
require (
github.com/HarryMichal/go-version v1.0.1
github.com/NVIDIA/go-nvlib v0.7.1
github.com/NVIDIA/go-nvlib v0.7.2
github.com/NVIDIA/go-nvml v0.12.4-1
github.com/NVIDIA/nvidia-container-toolkit v1.17.5
github.com/NVIDIA/nvidia-container-toolkit v1.17.8
github.com/acobaugh/osrelease v0.1.0
github.com/briandowns/spinner v1.23.2
github.com/docker/go-units v0.5.0

View File

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

View File

@ -38,7 +38,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -R)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -R
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -R'
assert_success
assert_line --index 0 "$limit"
@ -53,7 +53,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -R)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -R
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -R'
assert_success
assert_line --index 0 "$limit"
@ -68,7 +68,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -c)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -c
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -c'
assert_success
assert_line --index 0 "$limit"
@ -83,7 +83,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -c)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -c
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -c'
assert_success
assert_line --index 0 "$limit"
@ -98,7 +98,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -d)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -d
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -d'
assert_success
assert_line --index 0 "$limit"
@ -113,7 +113,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -d)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -d
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -d'
assert_success
assert_line --index 0 "$limit"
@ -128,7 +128,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -e)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -e
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -e'
assert_success
assert_line --index 0 "$limit"
@ -143,7 +143,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -e)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -e
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -e'
assert_success
assert_line --index 0 "$limit"
@ -158,7 +158,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -f)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -f
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -f'
assert_success
assert_line --index 0 "$limit"
@ -173,7 +173,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -f)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -f
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -f'
assert_success
assert_line --index 0 "$limit"
@ -188,7 +188,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -i)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -i
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -i'
assert_success
assert_line --index 0 "$limit"
@ -203,7 +203,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -i)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -i
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -i'
assert_success
assert_line --index 0 "$limit"
@ -218,7 +218,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -l)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -l
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -l'
assert_success
assert_line --index 0 "$limit"
@ -233,7 +233,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -l)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -l
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -l'
assert_success
assert_line --index 0 "$limit"
@ -248,7 +248,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -m)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -m
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -m'
assert_success
assert_line --index 0 "$limit"
@ -263,7 +263,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -m)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -m
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -m'
assert_success
assert_line --index 0 "$limit"
@ -278,7 +278,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -n)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -n
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -n'
assert_success
assert_line --index 0 "$limit"
@ -293,7 +293,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -n)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -n
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -n'
assert_success
assert_line --index 0 "$limit"
@ -308,7 +308,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -p)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -p
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -p'
assert_success
assert_line --index 0 "$limit"
@ -323,7 +323,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -p)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -p
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -p'
assert_success
assert_line --index 0 "$limit"
@ -338,7 +338,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -q)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -q
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -q'
assert_success
assert_line --index 0 "$limit"
@ -353,7 +353,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -q)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -q
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -q'
assert_success
assert_line --index 0 "$limit"
@ -368,7 +368,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -r)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -r
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -r'
assert_success
assert_line --index 0 "$limit"
@ -383,7 +383,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -r)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -r
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -r'
assert_success
assert_line --index 0 "$limit"
@ -398,7 +398,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -s)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -s
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -s'
assert_success
assert_line --index 0 "$limit"
@ -413,7 +413,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -s)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -s
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -s'
assert_success
assert_line --index 0 "$limit"
@ -428,7 +428,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -t)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -t
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -t'
assert_success
assert_line --index 0 "$limit"
@ -443,7 +443,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -t)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -t
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -t'
assert_success
assert_line --index 0 "$limit"
@ -458,7 +458,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -u)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -u
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -u'
assert_success
assert_line --index 0 "$limit"
@ -473,7 +473,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -u)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -u
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -u'
assert_success
assert_line --index 0 "$limit"
@ -488,7 +488,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -v)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -v
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -v'
assert_success
assert_line --index 0 "$limit"
@ -503,7 +503,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -v)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -v
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -v'
assert_success
assert_line --index 0 "$limit"
@ -518,7 +518,7 @@ teardown_file() {
local limit
limit=$(ulimit -H -x)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -H -x
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -H -x'
assert_success
assert_line --index 0 "$limit"
@ -533,7 +533,7 @@ teardown_file() {
local limit
limit=$(ulimit -S -x)
run --keep-empty-lines --separate-stderr "$TOOLBX" run ulimit -S -x
run --keep-empty-lines --separate-stderr "$TOOLBX" run bash -c 'ulimit -S -x'
assert_success
assert_line --index 0 "$limit"