From ae842f9b8b69064c22c178860a92ae06f183bb77 Mon Sep 17 00:00:00 2001
From: YuQiang <y_q_email@163.com>
Date: Wed, 13 Mar 2024 17:13:55 +0800
Subject: [PATCH] action: merge and move prepare.sh remove
 misc/performance/prepare.sh and misc/performance/prepare.sh and merge to
 misc/prepare.sh

Signed-off-by: YuQiang <y_q_email@163.com>
---
 .github/workflows/smoke.yml       |  7 ++++---
 misc/{performance => }/prepare.sh |  7 ++++++-
 misc/takeover/prepare.sh          | 23 -----------------------
 3 files changed, 10 insertions(+), 27 deletions(-)
 rename misc/{performance => }/prepare.sh (86%)
 delete mode 100755 misc/takeover/prepare.sh

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index f446a8537f4..728f2c25aee 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -165,7 +165,8 @@ jobs:
         sudo mkdir -p /usr/bin/nydus-latest /home/runner/work/workdir
         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//./_}"
 
@@ -302,7 +303,7 @@ jobs:
         path: contrib/nydusify/cmd
     - name: Prepare Nydus Container Environment
       run: |
-        sudo bash misc/performance/prepare.sh
+        sudo bash misc/prepare.sh
     - name: Performance Test
       run: |
         export PERFORMANCE_TEST_MODE=${{ matrix.mode }}
@@ -326,7 +327,7 @@ jobs:
         path: contrib/nydusify/cmd
     - name: Prepare Nydus Container Environment
       run: |
-        sudo bash misc/takeover/prepare.sh
+        sudo bash misc/prepare.sh takeover_test
     - name: Takeover Test
       run: |
         export NEW_NYDUSD_BINARY_PATH=target/release/nydusd
diff --git a/misc/performance/prepare.sh b/misc/prepare.sh
similarity index 86%
rename from misc/performance/prepare.sh
rename to misc/prepare.sh
index 8ea57518af8..5da0af16600 100644
--- a/misc/performance/prepare.sh
+++ b/misc/prepare.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+SNAPSHOTTER_CONFIG="misc/takeover/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
@@ -18,6 +23,6 @@ sudo tar -xzvf cni-plugins-linux-amd64-v$CNI_PLUGINS_VERSION.tgz -C /opt/cni/bin
 sudo install -D misc/performance/containerd_config.toml /etc/containerd/config.toml
 sudo systemctl restart containerd
 sudo install -D misc/performance/nydusd_config.json /etc/nydus/nydusd-config.fusedev.json
-sudo install -D misc/performance/snapshotter_config.toml /etc/nydus/config.toml
+sudo install -D $SNAPSHOTTER_CONFIG /etc/nydus/config.toml
 sudo install -D misc/performance/nydus-snapshotter.service /etc/systemd/system/nydus-snapshotter.service
 sudo systemctl start nydus-snapshotter
diff --git a/misc/takeover/prepare.sh b/misc/takeover/prepare.sh
deleted file mode 100755
index 92782426c34..00000000000
--- a/misc/takeover/prepare.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-readonly SNAPSHOTTER_VERSION=0.13.3
-readonly NERDCTL_VERSION=1.7.0
-readonly CNI_PLUGINS_VERSION=1.3.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
-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
-sudo wget https://github.com/containernetworking/plugins/releases/download/v$CNI_PLUGINS_VERSION/cni-plugins-linux-amd64-v$CNI_PLUGINS_VERSION.tgz 
-sudo tar -xzvf cni-plugins-linux-amd64-v$CNI_PLUGINS_VERSION.tgz -C /opt/cni/bin
-sudo install -D misc/performance/containerd_config.toml /etc/containerd/config.toml
-sudo systemctl restart containerd
-sudo install -D misc/performance/nydusd_config.json /etc/nydus/nydusd-config.fusedev.json
-sudo install -D misc/takeover/snapshotter_config.toml /etc/nydus/config.toml
-sudo install -D misc/performance/nydus-snapshotter.service /etc/systemd/system/nydus-snapshotter.service
-sudo systemctl start nydus-snapshotter