From b60889d5b279ab82ce7ec0dc218d707a881202e0 Mon Sep 17 00:00:00 2001
From: Toru Komatsu <k0ma@utam0k.jp>
Date: Tue, 2 Jan 2024 19:08:55 +0900
Subject: [PATCH] Update to Containerd 1.7.11 for e2e integration tests (#2558)

* Containerd 1.7.10

Signed-off-by: utam0k <k0ma@utam0k.jp>

* Update to containerd v1.7.11 and mirror steps from vagrantfile in CI

---------

Signed-off-by: utam0k <k0ma@utam0k.jp>
Co-authored-by: Yashodhan Joshi <yjdoc2@gmail.com>
---
 .github/workflows/e2e.yaml   |  9 ++++++---
 Vagrantfile.containerd2youki | 11 ++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
index 720c62c5..6c4a2b82 100644
--- a/.github/workflows/e2e.yaml
+++ b/.github/workflows/e2e.yaml
@@ -51,10 +51,10 @@ jobs:
       - uses: actions/checkout@v3
         with:
           repository: containerd/containerd
-          ref: v1.6.20
+          ref: v1.7.11
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.20'
+          go-version: '1.20.12'
           cache: true
       - run: sudo apt-get -y update
       - run: sudo apt-get install -y pkg-config libsystemd-dev libelf-dev libseccomp-dev btrfs-progs libbtrfs-dev
@@ -62,6 +62,9 @@ jobs:
         run: |
           make build
           make binaries
+          sudo make install
+          ./script/setup/install-cni
+          ./script/setup/install-critools
       - name: Download youki binary
         uses: actions/download-artifact@v3
         with:
@@ -73,7 +76,7 @@ jobs:
           sudo cp youki /usr/bin/runc
           runc --version
       - name: Integration Test
-        run: sudo make TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 40m" integration
+        run: sudo make RUNC_FLAVOR=crun TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 40m" integration
 
   k8s-tests:
     runs-on: ubuntu-22.04
diff --git a/Vagrantfile.containerd2youki b/Vagrantfile.containerd2youki
index 6907a019..d23588dc 100644
--- a/Vagrantfile.containerd2youki
+++ b/Vagrantfile.containerd2youki
@@ -1,6 +1,9 @@
 # -*- mode: ruby -*-
 # vi: set ft=ruby :
 
+GO_VERSION = "1.20.12"
+CONTAINERD_VERSION = "1.7.11"
+
 Vagrant.configure("2") do |config|
     config.vm.box = "generic/ubuntu2204"
     config.vm.synced_folder '.', '/vagrant/youki', disabled: false
@@ -13,6 +16,7 @@ Vagrant.configure("2") do |config|
     config.vm.provision "bootstrap", type: "shell" do |s|
       s.inline = <<-SHELL
         set -e -u -o pipefail
+        export DEBIAN_FRONTEND=noninteractive
         apt-get update && apt-get install -y \
           make \
           pkg-config         \
@@ -23,15 +27,15 @@ Vagrant.configure("2") do |config|
           libseccomp-dev \
           libbtrfs-dev \
           btrfs-progs
-        wget --quiet https://go.dev/dl/go1.18.1.linux-amd64.tar.gz -O /tmp/go1.18.1.linux-amd64.tar.gz
-        rm -rf /usr/local/go && tar -C /usr/local -xzf /tmp/go1.18.1.linux-amd64.tar.gz
+        wget --quiet https://go.dev/dl/go#{GO_VERSION}.linux-amd64.tar.gz -O /tmp/go#{GO_VERSION}.linux-amd64.tar.gz
+        rm -rf /usr/local/go && tar -C /usr/local -xzf /tmp/go#{GO_VERSION}.linux-amd64.tar.gz
         echo "export PATH=$PATH:/usr/local/go/bin" >> ~/.bashrc
         echo "export GOPATH=$HOME/go" >> ~/.bashrc
         export PATH=$PATH:$HOME/.cargo/bin:/usr/local/go/bin
         export GOPATH=$HOME/go
 
         git clone https://github.com/containerd/containerd \
-          /root/go/src/github.com/containerd/containerd -b v1.6.20
+          /root/go/src/github.com/containerd/containerd -b v#{CONTAINERD_VERSION}
 
         cd /root/go/src/github.com/containerd/containerd
         make
@@ -47,6 +51,7 @@ Vagrant.configure("2") do |config|
 
     config.vm.provision "test", type: "shell" do |s|
         s.inline = <<-SHELL
+          export RUNC_FLAVOR=crun
           cd /root/go/src/github.com/containerd/containerd/
           export PATH=$PATH:$HOME/.cargo/bin:/usr/local/go/bin
           make TEST_RUNTIME=io.containerd.runc.v2 TESTFLAGS="-timeout 120m" integration | tee result.txt