From 2e935631343098dd497304c169e3217cb6b2ba1b Mon Sep 17 00:00:00 2001
From: Yadong Ding <ding_yadong@foxmail.com>
Date: Wed, 5 Jun 2024 21:42:39 +0800
Subject: [PATCH] chore: upgrade components version in test env

1. Upgrade cni to v1.5.0 and try to fix error in TestCommit.
2. upgrade nerdctl to v1.7.6.
3. upgrade nydus-snapshotter to v0.13.13 and fix path error.

Signed-off-by: Yadong Ding <ding_yadong@foxmail.com>
---
 .github/workflows/smoke.yml             |  2 +-
 misc/performance/containerd_config.toml |  8 ++++----
 misc/performance/nydusd_config.json     |  6 +++++-
 misc/prepare.sh                         | 14 +++++++-------
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 8a8eaa3d2b1..5214582de3f 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -166,7 +166,7 @@ jobs:
         sudo install -D -m 755 contrib/nydusify/cmd/nydusify /usr/bin/nydus-latest
         sudo install -D -m 755 target/release/nydusd target/release/nydus-image /usr/bin/nydus-latest
         sudo bash misc/prepare.sh
-        
+
         export NYDUS_STABLE_VERSION=$(curl https://api.github.com/repos/Dragonflyoss/nydus/releases/latest | jq -r '.tag_name')
         export NYDUS_STABLE_VERSION_EXPORT="${NYDUS_STABLE_VERSION//./_}"
 
diff --git a/misc/performance/containerd_config.toml b/misc/performance/containerd_config.toml
index e2bc6705352..129a0e6a539 100644
--- a/misc/performance/containerd_config.toml
+++ b/misc/performance/containerd_config.toml
@@ -6,10 +6,10 @@ oom_score = 0
 [debug]
   level = "debug"
 
-[plugins."io.containerd.grpc.v1.cri"]
-  [plugins."io.containerd.grpc.v1.cri".containerd]
-      snapshotter = "nydus"
-      disable_snapshot_annotations = false
+[plugins."io.containerd.grpc.v1.cri".containerd]
+  snapshotter = "nydus"
+  disable_snapshot_annotations = false
+  discard_unpacked_layers = false
 
 [proxy_plugins]
   [proxy_plugins.nydus]
diff --git a/misc/performance/nydusd_config.json b/misc/performance/nydusd_config.json
index e3691c38400..1f7fd38927b 100644
--- a/misc/performance/nydusd_config.json
+++ b/misc/performance/nydusd_config.json
@@ -4,7 +4,11 @@
             "type": "registry",
             "config": {
                 "scheme": "http",
-                "host": "localhost:5000"
+                "host": "localhost:5077",
+                "skip_verify": true,
+                "timeout": 5,
+                "connect_timeout": 5,
+                "retry_limit": 4
             }
         },
         "cache": {
diff --git a/misc/prepare.sh b/misc/prepare.sh
index 5da0af16600..80d70e74c4f 100644
--- a/misc/prepare.sh
+++ b/misc/prepare.sh
@@ -1,20 +1,20 @@
 #!/bin/bash
 
-SNAPSHOTTER_CONFIG="misc/takeover/snapshotter_config.toml"
+SNAPSHOTTER_CONFIG="misc/performance/snapshotter_config.toml"
 if [ "$1" == "takeover_test" ]; then
     SNAPSHOTTER_CONFIG="misc/takeover/snapshotter_config.toml"
 fi
 
-readonly SNAPSHOTTER_VERSION=0.13.3
-readonly NERDCTL_VERSION=1.7.0
-readonly CNI_PLUGINS_VERSION=1.3.0
+readonly SNAPSHOTTER_VERSION=0.13.13
+readonly NERDCTL_VERSION=1.7.6
+readonly CNI_PLUGINS_VERSION=1.5.0
 
 # setup nerdctl and nydusd env
 sudo install -D -m 755 contrib/nydusify/cmd/nydusify /usr/local/bin
 sudo install -D -m 755 target/release/nydusd target/release/nydus-image /usr/local/bin
-wget https://github.com/containerd/nydus-snapshotter/releases/download/v$SNAPSHOTTER_VERSION/nydus-snapshotter-v$SNAPSHOTTER_VERSION-x86_64.tgz
-tar zxvf nydus-snapshotter-v$SNAPSHOTTER_VERSION-x86_64.tgz
-sudo install -D -m 755 nydus-snapshotter/containerd-nydus-grpc /usr/local/bin
+wget https://github.com/containerd/nydus-snapshotter/releases/download/v$SNAPSHOTTER_VERSION/nydus-snapshotter-v$SNAPSHOTTER_VERSION-linux-amd64.tar.gz
+tar zxvf nydus-snapshotter-v$SNAPSHOTTER_VERSION-linux-amd64.tar.gz
+sudo install -D -m 755 bin/containerd-nydus-grpc /usr/local/bin
 sudo wget https://github.com/containerd/nerdctl/releases/download/v$NERDCTL_VERSION/nerdctl-$NERDCTL_VERSION-linux-amd64.tar.gz
 sudo tar -xzvf nerdctl-$NERDCTL_VERSION-linux-amd64.tar.gz -C /usr/local/bin
 sudo mkdir -p /opt/cni/bin