mirror of
https://github.com/opencontainers/runc.git
synced 2026-07-11 06:03:57 +08:00
ci/gha: switch to ubuntu 24.04
Let's replace ubuntu-22.04 with ubuntu-24.04 where we can, and keep ubuntu-20.04 to test cgroup v1 stuff. Leave ubuntu-22.04 for ci/cross-i386 (issue with systemctl restart hang after apt install). This can be addressed separately later. The only kludge we have to add is enable userns for runc binary being tested (as userns is disabled by apparmor system-wide by default now, see [1]). [1] https://discourse.ubuntu.com/t/ubuntu-24-04-lts-noble-numbat-release-notes/39890#unprivileged-user-namespace-restrictions-15 Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This commit is contained in:
@@ -23,7 +23,7 @@ jobs:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-20.04, ubuntu-22.04, actuated-arm64-6cpu-8gb]
|
||||
os: [ubuntu-20.04, ubuntu-24.04, actuated-arm64-6cpu-8gb]
|
||||
go-version: [1.20.x, 1.21.x]
|
||||
rootless: ["rootless", ""]
|
||||
race: ["-race", ""]
|
||||
@@ -158,6 +158,12 @@ jobs:
|
||||
with:
|
||||
bats-version: 1.9.0
|
||||
|
||||
- name: Allow userns for runc
|
||||
# https://discourse.ubuntu.com/t/ubuntu-24-04-lts-noble-numbat-release-notes/39890#unprivileged-user-namespace-restrictions-15
|
||||
if: matrix.os == 'ubuntu-24.04'
|
||||
run: |
|
||||
sed "s;^profile runc /usr/sbin/;profile runc-test $PWD/;" < /etc/apparmor.d/runc | sudo apparmor_parser
|
||||
|
||||
- name: unit test
|
||||
if: matrix.rootless != 'rootless'
|
||||
env:
|
||||
@@ -174,7 +180,7 @@ jobs:
|
||||
sudo cp $HOME/rootless.key /home/rootless/.ssh/id_ecdsa
|
||||
sudo cp $HOME/rootless.key.pub /home/rootless/.ssh/authorized_keys
|
||||
sudo chown -R rootless.rootless /home/rootless
|
||||
sudo chmod a+X $HOME # for Ubuntu 22.04
|
||||
sudo chmod a+X $HOME # for Ubuntu 22.04 and later
|
||||
|
||||
- name: integration test (fs driver)
|
||||
run: sudo -E PATH="$PATH" script -e -c 'make local${{ matrix.rootless }}integration'
|
||||
|
||||
Reference in New Issue
Block a user