[CI ONLY][rc95] disable criu in tests

Most probably this old version of runc no longer works correctly with the latest criu. Not installing criu means criu tests will be skipped. Signed-off-by: Kir Kolyshkin <[email protected]>
kolyshkin · Feb 6, 2024 · b7b51e3 · b7b51e3
1 parent 8ce9f1d
commit b7b51e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -9,7 +9,7 @@ task:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
     BATS_VERSION: "v1.9.0"
-    RPMS: gcc git iptables jq glibc-static libseccomp-devel make criu fuse-sshfs container-selinux
+    RPMS: gcc git iptables jq glibc-static libseccomp-devel make fuse-sshfs container-selinux
     # yamllint disable rule:key-duplicates
     matrix:
       DISTRO: centos-7
@@ -26,7 +26,6 @@ task:
   install_dependencies_script: |
     case $DISTRO in
     centos-7)
-      (cd /etc/yum.repos.d && curl -O https://copr.fedorainfracloud.org/coprs/adrian/criu-el7/repo/epel-7/adrian-criu-el7-epel-7.repo)
       # EPEL is needed for jq and fuse-sshfs.
       rpm -q epel-release || rpm -Uvh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
       # sysctl

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,10 +31,8 @@ jobs:
 
     - name: install deps
       run: |
-        # criu repo
-        sudo add-apt-repository -y ppa:criu/ppa
-        # apt-add-repository runs apt update so we don't have to
-        sudo apt -q install libseccomp-dev criu
+        sudo apt -q update
+        sudo apt -q install libseccomp-dev
 
     - name: install go ${{ matrix.go-version }}
       uses: actions/setup-go@v2
@@ -168,14 +166,12 @@ jobs:
     - name: install deps
       run: |
         sudo dpkg --add-architecture i386
-        # add criu repo
-        sudo add-apt-repository -y ppa:criu/ppa
-        # apt-add-repository runs apt update so we don't have to.
+        sudo apt -q update
 
         # Due to a bug in apt, we have to update it first
         # (see https://bugs.launchpad.net/ubuntu-cdimage/+bug/1871268)
         sudo apt -q install apt
-        sudo apt -q install libseccomp-dev libseccomp-dev:i386 gcc-multilib criu
+        sudo apt -q install libseccomp-dev libseccomp-dev:i386 gcc-multilib
 
     - name: install go
       uses: actions/setup-go@v2 # use default Go version