From b541817bdeffec72f1585dbf41c1f85b5398cff4 Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Wed, 24 Apr 2024 17:31:14 -0700 Subject: [PATCH] [test] ci/actuated: re-enable CRIU tests ...and fix criu repo path assignment so it works for actuated case. Signed-off-by: Kir Kolyshkin --- .github/workflows/test.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 33286b1b0ae..e9fe1d8ffba 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -123,20 +123,18 @@ jobs: sudo apt -y install libseccomp-dev sshfs uidmap - name: install CRIU - # TODO: enable CRIU for actuated: https://github.com/opencontainers/runc/pull/4142#issuecomment-1945408382 - if: ${{ matrix.os != 'actuated-arm64-6cpu-8gb' && matrix.criu == '' }} + if: ${{ matrix.criu == '' }} env: PREFIX: https://download.opensuse.org/repositories/devel:/tools:/criu/xUbuntu run: | - # criu repo - REPO=${PREFIX}_$(echo ${{ matrix.os }} | sed 's/.*-//') + REPO=${PREFIX}_$(. /etc/os-release && echo $VERSION_ID) curl -fSsLl $REPO/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/devel_tools_criu.gpg > /dev/null echo "deb $REPO/ /" | sudo tee /etc/apt/sources.list.d/criu.list sudo apt update sudo apt -y install criu - name: install CRIU (criu ${{ matrix.criu }}) - if: ${{ matrix.os != 'actuated-arm64-6cpu-8gb' && matrix.criu != '' }} + if: ${{ matrix.criu != '' }} run: | sudo apt -qy install \ libcap-dev libnet1-dev libnl-3-dev \