From 147128b3b99d269294c738584853265a83fd12e4 Mon Sep 17 00:00:00 2001
From: ZhangXinyi <9880220+zhangxinyi1024@user.noreply.gitee.com>
Date: Fri, 22 Nov 2024 11:50:39 +0800
Subject: [PATCH 1/2] fix git clone problem

---
 tests/mooncake-selftests/install.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/mooncake-selftests/install.sh b/tests/mooncake-selftests/install.sh
index bb17080..6c4cb76 100644
--- a/tests/mooncake-selftests/install.sh
+++ b/tests/mooncake-selftests/install.sh
@@ -3,6 +3,7 @@ INSTALL_DEP=${INSTALL_DEP:-"0"}
  
 build()
 {
+    GIT_SSH_COMMAND='ssh -i /root/.ssh/id_rsa'
     git clone git@github.com:kvcache-ai/mooncake-dev.git $TONE_BM_BUILD_DIR/mooncake
     set -x
     cd $TONE_BM_BUILD_DIR/mooncake
-- 
Gitee


From 792923b27ccc0c7df1bf2674448526288517aacf Mon Sep 17 00:00:00 2001
From: ZhangXinyi <9880220+zhangxinyi1024@user.noreply.gitee.com>
Date: Thu, 28 Nov 2024 11:39:12 +0800
Subject: [PATCH 2/2] adapt the mooncake test to ci-procedure

---
 conf/functional/mooncake-selftests.conf |  3 +--
 tests/mooncake-selftests/install.sh     | 16 +++++++++++++---
 tests/mooncake-selftests/run.sh         | 25 ++++++++-----------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/conf/functional/mooncake-selftests.conf b/conf/functional/mooncake-selftests.conf
index 0e45376..7dff108 100644
--- a/conf/functional/mooncake-selftests.conf
+++ b/conf/functional/mooncake-selftests.conf
@@ -1,3 +1,2 @@
 test
-transfer-engine-selftests
-transfer-engine-examples
\ No newline at end of file
+ci-test
\ No newline at end of file
diff --git a/tests/mooncake-selftests/install.sh b/tests/mooncake-selftests/install.sh
index 6c4cb76..0a6017f 100644
--- a/tests/mooncake-selftests/install.sh
+++ b/tests/mooncake-selftests/install.sh
@@ -1,12 +1,22 @@
 #!/bin/bash
 INSTALL_DEP=${INSTALL_DEP:-"0"}
- 
+
 build()
 {
     GIT_SSH_COMMAND='ssh -i /root/.ssh/id_rsa'
-    git clone git@github.com:kvcache-ai/mooncake-dev.git $TONE_BM_BUILD_DIR/mooncake
-    set -x
+    git clone ${CI_REPO_URL} $TONE_BM_BUILD_DIR/mooncake
     cd $TONE_BM_BUILD_DIR/mooncake
+    git fetch origin ${CI_REPO_TARGET_BRANCH} :target_branch
+    git checkout target_branch
+    git reset --hard ${CI_REPO_TARGET_COMMIT}
+    git fetch origin ${CI_REPO_SOURCE_BRANCH} :source_branch
+    git checkout source_branch
+    git reset --hard ${CI_REPO_SOURCE_COMMIT}
+    git rebase target_branch
+    if [[ $? != 0 ]]; then
+        echo "rebase fail!"
+        return -1
+    fi
     if [[ "$INSTALL_DEP" == 1 ]]; then
         bash dependencies.sh
     fi
diff --git a/tests/mooncake-selftests/run.sh b/tests/mooncake-selftests/run.sh
index 45d0847..0edcafd 100644
--- a/tests/mooncake-selftests/run.sh
+++ b/tests/mooncake-selftests/run.sh
@@ -11,23 +11,14 @@ setup()
  
 run()
 {
-    set -x
     export LD_LIBRARY_PATH=/usr/local/lib/
-    [ -f $TONE_BM_RUN_DIR/result.log ] && rm $TONE_BM_RUN_DIR/result.log 
-    touch $TONE_BM_RUN_DIR/result.log
-    if [[ "$test" == "transfer-engine-selftests" ]]; then
-        cd $TONE_BM_RUN_DIR/mooncake/build/mooncake-transfer-engine/tests
-        for case in $(ls | grep test); do
-            if echo $case | grep rdma; then
-                 echo "$case: Skip" >> $TONE_BM_RUN_DIR/result.log
-            else
-                 eval "timeout 300s ./$case"
-                 if [[ $? -eq 0 ]];then
-                      echo "$case: Pass" >> $TONE_BM_RUN_DIR/result.log
-                 else
-                      echo "$case: Fail" >> $TONE_BM_RUN_DIR/result.log
-                 fi
-            fi
+    [ -f $TONE_BM_RUN_DIR/results.txt ] && rm $TONE_BM_RUN_DIR/results.txt
+    touch $TONE_BM_RUN_DIR/results.txt
+    if [[ "$test" == "ci-test" ]]; then
+        cd $TONE_BM_RUN_DIR/mooncake/.ci
+        for case in $(ls | grep .sh); do
+            chmod +x "$case"
+            ./$case $TONE_BM_RUN_DIR/mooncake/build $TONE_BM_RUN_DIR
         done
     fi
 }
@@ -35,5 +26,5 @@ run()
  
 parse()
 {
-    cat $TONE_BM_RUN_DIR/result.log
+    cat $TONE_BM_RUN_DIR/results.txt
 }
\ No newline at end of file
-- 
Gitee