Skip to content

Commit baba55e

Browse files
committed
ci/actuated: re-enable CRIU tests
They were failing earlier but are working now. This includes a fix to criu repo path assignment so it works for actuated case. Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent f6b7167 commit baba55e

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,20 +123,18 @@ jobs:
123123
sudo apt -y install libseccomp-dev sshfs uidmap
124124
125125
- name: install CRIU
126-
# TODO: enable CRIU for actuated: https://github.com/opencontainers/runc/pull/4142#issuecomment-1945408382
127-
if: ${{ matrix.os != 'actuated-arm64-6cpu-8gb' && matrix.criu == '' }}
126+
if: ${{ matrix.criu == '' }}
128127
env:
129128
PREFIX: https://download.opensuse.org/repositories/devel:/tools:/criu/xUbuntu
130129
run: |
131-
# criu repo
132-
REPO=${PREFIX}_$(echo ${{ matrix.os }} | sed 's/.*-//')
130+
REPO=${PREFIX}_$(. /etc/os-release && echo $VERSION_ID)
133131
curl -fSsLl $REPO/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_tools_criu.gpg > /dev/null
134132
echo "deb $REPO/ /" | sudo tee /etc/apt/sources.list.d/criu.list
135133
sudo apt update
136134
sudo apt -y install criu
137135
138136
- name: install CRIU (criu ${{ matrix.criu }})
139-
if: ${{ matrix.os != 'actuated-arm64-6cpu-8gb' && matrix.criu != '' }}
137+
if: ${{ matrix.criu != '' }}
140138
run: |
141139
sudo apt -qy install \
142140
libcap-dev libnet1-dev libnl-3-dev \

0 commit comments

Comments
 (0)