From 9f968b373d2a9beacb7992bbd9bcfe42dd029a3c Mon Sep 17 00:00:00 2001
From: zhuzhengyi001 <zhuzhengyi001@ke.com>
Date: Tue, 24 Aug 2021 11:26:34 +0800
Subject: [PATCH] Enhancement: update dockerimage for s3test

Signed-off-by: zhuzhengyi001 <zhuzhengyi001@ke.com>
Signed-off-by: slasher <shenjie1@oppo.com>
---
 .gitlab-ci.yml                     |  1 +
 docker/docker-compose.yml          |  6 +++---
 docker/script/run_test.sh          | 13 +------------
 docker/script/start_client.sh      |  2 +-
 docker/script/start_client_auth.sh |  4 ++--
 docker/script/start_lcnode.sh      |  0
 6 files changed, 8 insertions(+), 18 deletions(-)
 mode change 100644 => 100755 docker/script/start_client_auth.sh
 mode change 100644 => 100755 docker/script/start_lcnode.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e569b709..b0d24c6f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,6 +25,7 @@ ltptest:
   tags:
     - cfs
   script:
+    - docker/run_docker.sh --clean
     - rm -rf docker/docker_data/*
     - docker/run_docker.sh -l
 
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 22a7eaa2a..769acfd10 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -352,7 +352,7 @@ services:
                 ipv4_address: 192.168.0.43
 
     lcnode1:
-        image: ghcr.io/cubefs/cbfs-base:1.0-golang-1.16.12
+        image: ${IMAGE}
         ports:
             - "17410"
             - 9500
@@ -372,7 +372,7 @@ services:
 
 
     lcnode2:
-        image: ghcr.io/cubefs/cbfs-base:1.0-golang-1.16.12
+        image: ${IMAGE}
         ports:
             - "17410"
             - 9500
@@ -391,7 +391,7 @@ services:
                 ipv4_address: 192.168.0.62
 
     lcnode3:
-        image: ghcr.io/cubefs/cbfs-base:1.0-golang-1.16.12
+        image: ${IMAGE}
         ports:
             - "17410"
             - 9500
diff --git a/docker/script/run_test.sh b/docker/script/run_test.sh
index b06920fc6..a0952bc8e 100755
--- a/docker/script/run_test.sh
+++ b/docker/script/run_test.sh
@@ -264,6 +264,7 @@ delete_volumes() {
 test_bucket() {
     BUCKET=${bucket} python3 -m unittest2 discover ${work_path} "*.py" -v
     if [[ $? -ne 0 ]]; then
+        echo -e "\033[31mS3 unittest FAILED\033[0m"
         exit 1
     fi
     echo "Test bucket ${bucket} succeeded!"
@@ -276,18 +277,6 @@ run_s3_test() {
     echo "    S3 compatibility tests    ";
     echo "******************************";
 
-    # install system requirements
-    echo -n "Installing system requirements  ... "
-    apt-get update &>> /dev/null && apt-get install -y \
-        sudo \
-        python3 \
-        python3-pip &>> /dev/null
-    if [[ $? -ne 0 ]] ; then
-        echo -e "\033[31mfail\033[0m"
-        exit 1
-    fi
-    echo -e "\033[32mdone\033[0m"
-
     # install python requirements
     echo -n "Installing python requirements  ... "
     pip3 install -r  ${work_path}/requirements.txt &>> /dev/null
diff --git a/docker/script/start_client.sh b/docker/script/start_client.sh
index a6aec8532..adab39092 100755
--- a/docker/script/start_client.sh
+++ b/docker/script/start_client.sh
@@ -140,7 +140,7 @@ start_client() {
         sta=$(stat $MntPoint 2>/dev/null | tr ":：" " "  | awk '/Inode/{print $4}')
         if [[ "x$sta" == "x1" ]] ; then
             ok=1
-	        echo -e "\033[32mdone\033[0m"
+            echo -e "\033[32mdone\033[0m"
             exit 0
         fi
     done
diff --git a/docker/script/start_client_auth.sh b/docker/script/start_client_auth.sh
old mode 100644
new mode 100755
index 869ad76e3..9f48534e4
--- a/docker/script/start_client_auth.sh
+++ b/docker/script/start_client_auth.sh
@@ -100,7 +100,7 @@ start_client() {
         sta=$(stat $MntPoint 2>/dev/null | tr ":：" " "  | awk '/Inode/{print $4}')
         if [[ "x$sta" == "x1" ]] ; then
             ok=1
-	        echo "ok"
+            echo "ok"
             exit 0
         fi
     done
@@ -112,4 +112,4 @@ getLeaderAddr
 check_status "MetaNode"
 check_status "DataNode"
 create_vol
-start_client
\ No newline at end of file
+start_client
diff --git a/docker/script/start_lcnode.sh b/docker/script/start_lcnode.sh
old mode 100644
new mode 100755