mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-11 06:03:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3261 from kolyshkin/test-f35

Browse Source 
ci/cirrus: use Fedora 35
This commit is contained in:
Mrunal Patel
2021-11-03 20:29:47 -07:00
committed by GitHub
parent a7ccc02fd5 4b25a4e82a
commit 931eb942aa
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.cirrus.yml
+1 -1
View File
@@ -14,7 +14,7 @@ task:
HOME: /root HOME: /root
# yamllint disable rule:key-duplicates # yamllint disable rule:key-duplicates
matrix: matrix:
DISTRO: fedora34 DISTRO: fedora
name: vagrant DISTRO:$DISTRO name: vagrant DISTRO:$DISTRO
Vagrantfile.fedora34 → Vagrantfile.fedora
+1 -1
View File
@@ -3,7 +3,7 @@
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
# Fedora box is used for testing cgroup v2 support # Fedora box is used for testing cgroup v2 support
config.vm.box = "fedora/34-cloud-base" config.vm.box = "fedora/35-cloud-base"
config.vm.provider :virtualbox do |v| config.vm.provider :virtualbox do |v|
v.memory = 2048 v.memory = 2048
v.cpus = 2 v.cpus = 2
tests/integration/cgroups.bats
+2 -2
View File
@@ -49,8 +49,8 @@ function setup() {
if [ "$(id -u)" = "0" ]; then if [ "$(id -u)" = "0" ]; then
check_cgroup_value "cgroup.controllers" "$(cat /sys/fs/cgroup/machine.slice/cgroup.controllers)" check_cgroup_value "cgroup.controllers" "$(cat /sys/fs/cgroup/machine.slice/cgroup.controllers)"
else else
# Filter out hugetlb as systemd is unable to delegate it. # Filter out hugetlb and misc as systemd is unable to delegate them.
check_cgroup_value "cgroup.controllers" "$(sed 's/ hugetlb//' </sys/fs/cgroup/user.slice/user-"$(id -u)".slice/cgroup.controllers)" check_cgroup_value "cgroup.controllers" "$(sed -e 's/ hugetlb//' -e 's/ misc//' </sys/fs/cgroup/user.slice/user-"$(id -u)".slice/cgroup.controllers)"
fi fi
else else
check_cgroup_value "cgroup.controllers" "$(cat /sys/fs/cgroup/cgroup.controllers)" check_cgroup_value "cgroup.controllers" "$(cat /sys/fs/cgroup/cgroup.controllers)"
tests/integration/helpers.bash
+6
View File
@@ -544,6 +544,12 @@ function setup_bundle() {
ROOT=$(mktemp -d "$BATS_RUN_TMPDIR/runc.XXXXXX") ROOT=$(mktemp -d "$BATS_RUN_TMPDIR/runc.XXXXXX")
mkdir -p "$ROOT/state" "$ROOT/bundle/rootfs" mkdir -p "$ROOT/state" "$ROOT/bundle/rootfs"
# Directories created by mktemp -d have 0700 permission bits. Tests
# running inside userns (see userns.bats) need to access the directory
# as a different user to mount the rootfs. Since kernel v5.12, parent
# directories are also checked. Give a+x for these tests to work.
chmod a+x "$ROOT" "$BATS_RUN_TMPDIR"
setup_recvtty setup_recvtty
cd "$ROOT/bundle" || return cd "$ROOT/bundle" || return
tests/integration/userns.bats
-4
View File
@@ -15,10 +15,6 @@ function setup() {
mkdir -p rootfs/{proc,sys,tmp} mkdir -p rootfs/{proc,sys,tmp}
mkdir -p rootfs/tmp/mount-{1,2} mkdir -p rootfs/tmp/mount-{1,2}
# We need to give permissions for others so the uid inside the userns
# can mount the rootfs on itself. Otherwise the rootfs mount will fail.
chmod 755 "$ROOT"
if [ "$ROOTLESS" -eq 0 ]; then if [ "$ROOTLESS" -eq 0 ]; then
update_config ' .linux.namespaces += [{"type": "user"}] update_config ' .linux.namespaces += [{"type": "user"}]
| .linux.uidMappings += [{"hostID": 100000, "containerID": 0, "size": 65534}] | .linux.uidMappings += [{"hostID": 100000, "containerID": 0, "size": 65534}]