diff --git a/tests/army/storage/s3/s3Basic.json b/tests/army/storage/s3/s3Basic.json
new file mode 100644
index 0000000000..c3fcdb567c
--- /dev/null
+++ b/tests/army/storage/s3/s3Basic.json
@@ -0,0 +1,66 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "num_of_records_per_req": 4000,
+    "prepared_rand": 500,
+    "thread_count": 4,
+    "create_table_thread_count": 1,
+    "confirm_parameter_prompt": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "db",
+                "drop": "yes",
+                "vgroups": 2,
+                "replica": 1,
+                "duration":"10d",
+                "s3_keeplocal":"30d", 
+                "s3_chunksize":"131072",
+                "tsdb_pagesize":"1",
+                "s3_compact":"1",
+                "wal_retention_size":"1",
+                "wal_retention_period":"1",
+                "flush_each_batch":"no",
+                "keep": "3650d"
+            },
+            "super_tables": [
+                {
+                    "name": "stb",
+                    "child_table_exists": "no",
+                    "childtable_count": 6,
+                    "insert_rows": 2000000,
+                    "childtable_prefix": "d",
+                    "insert_mode": "taosc",
+                    "timestamp_step": 100,
+                    "start_timestamp": 1600000000000,
+                    "columns": [
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc" },
+                        { "type": "double",      "name": "dc"},
+                        { "type": "tinyint",     "name": "ti"},
+                        { "type": "smallint",    "name": "si" },
+                        { "type": "int",         "name": "ic" ,"max": 1,"min": 1},
+                        { "type": "bigint",      "name": "bi" },
+                        { "type": "utinyint",    "name": "uti"},
+                        { "type": "usmallint",   "name": "usi"},
+                        { "type": "uint",        "name": "ui" },
+                        { "type": "ubigint",     "name": "ubi"},
+                        { "type": "binary",      "name": "bin", "len": 32},
+                        { "type": "nchar",       "name": "nch", "len": 64}
+                    ],
+                    "tags": [
+                        {"type": "tinyint", "name": "groupid","max": 10,"min": 1},
+                        {"name": "location","type": "binary", "len": 16, "values":
+                           ["San Francisco", "Los Angles", "San Diego", "San Jose", "Palo Alto", "Campbell", "Mountain View","Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}
diff --git a/tests/army/storage/s3/s3Basic.py b/tests/army/storage/s3/s3Basic.py
new file mode 100644
index 0000000000..466cc5ab19
--- /dev/null
+++ b/tests/army/storage/s3/s3Basic.py
@@ -0,0 +1,358 @@
+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+
+import sys
+import time
+import random
+
+import taos
+import frame
+import frame.etool
+import frame.eos
+import frame.eutil
+
+from frame.log import *
+from frame.cases import *
+from frame.sql import *
+from frame.caseBase import *
+from frame.srvCtl import *
+from frame import *
+from frame.eos import *
+
+
+#  
+# 192.168.1.52 MINIO S3 
+#
+
+'''
+s3EndPoint     http://192.168.1.52:9000
+s3AccessKey    'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX'
+s3BucketName   ci-bucket
+s3UploadDelaySec 60
+
+for test:
+"s3AccessKey" : "fGPPyYjzytw05nw44ViA:vK1VcwxgSOykicx6hk8fL1x15uEtyDSFU3w4hTaZ"
+"s3BucketName": "test-bucket"
+'''
+
+
+class TDTestCase(TBase):
+    index = eutil.cpuRand(20) + 1
+    bucketName = f"ci-bucket{index}"
+    updatecfgDict = {
+        "supportVnodes":"1000",
+        's3EndPoint': 'http://192.168.1.52:9000', 
+        's3AccessKey': 'zOgllR6bSnw2Ah3mCNel:cdO7oXAu3Cqdb1rUdevFgJMi0LtRwCXdWKQx4bhX', 
+        's3BucketName': f'{bucketName}',
+        's3PageCacheSize': '10240',
+        "s3UploadDelaySec": "10",
+        's3MigrateIntervalSec': '600',
+        's3MigrateEnabled': '1'
+    }
+
+    tdLog.info(f"assign bucketName is {bucketName}\n")
+    maxFileSize = (128 + 10) * 1014 * 1024 # add 10M buffer
+
+    def insertData(self):
+        tdLog.info(f"insert data.")
+        # taosBenchmark run
+        json = etool.curFile(__file__, "s3Basic.json")
+        etool.benchMark(json=json)
+
+        tdSql.execute(f"use {self.db}")
+        # come from s3_basic.json
+        self.childtable_count = 6
+        self.insert_rows = 2000000
+        self.timestamp_step = 100
+
+    def createStream(self, sname):
+        sql = f"create stream {sname} fill_history 1 into stm1 as select count(*) from {self.db}.{self.stb} interval(10s);"
+        tdSql.execute(sql)
+
+    def migrateDbS3(self):
+        sql = f"s3migrate database {self.db}"
+        tdSql.execute(sql, show=True)
+
+    def checkDataFile(self, lines, maxFileSize):
+        # ls -l
+        # -rwxrwxrwx 1 root root  41652224 Apr 17 14:47 vnode2/tsdb/v2f1974ver47.3.data
+        overCnt = 0
+        for line in lines:
+            cols = line.split()
+            fileSize = int(cols[4])
+            fileName = cols[8]
+            #print(f" filesize={fileSize} fileName={fileName}  line={line}")
+            if fileSize > maxFileSize:
+                tdLog.info(f"error, {fileSize} over max size({maxFileSize}) {fileName}\n")
+                overCnt += 1
+            else:
+                tdLog.info(f"{fileName}({fileSize}) check size passed.")
+                
+        return overCnt
+
+    def checkUploadToS3(self):
+        rootPath = sc.clusterRootPath()
+        cmd = f"ls -l {rootPath}/dnode*/data/vnode/vnode*/tsdb/*.data"
+        tdLog.info(cmd)
+        loop = 0
+        rets = []
+        overCnt = 0
+        while loop < 200:
+            time.sleep(3)
+
+            # check upload to s3
+            rets = eos.runRetList(cmd)
+            cnt = len(rets)
+            if cnt == 0:
+                overCnt = 0
+                tdLog.info("All data file upload to server over.")
+                break
+            overCnt = self.checkDataFile(rets, self.maxFileSize)
+            if overCnt == 0:
+                uploadOK = True
+                tdLog.info(f"All data files({len(rets)}) size bellow {self.maxFileSize}, check upload to s3 ok.")
+                break
+
+            tdLog.info(f"loop={loop} no upload {overCnt} data files wait 3s retry ...")
+            if loop == 3:
+                sc.dnodeStop(1)
+                time.sleep(2)
+                sc.dnodeStart(1)
+            loop += 1
+            # miggrate
+            self.migrateDbS3()
+                
+        # check can pass
+        if overCnt > 0:
+            tdLog.exit(f"s3 have {overCnt} files over size.")
+
+
+    def doAction(self):
+        tdLog.info(f"do action.")
+
+        self.flushDb(show=True)
+        #self.compactDb(show=True)
+
+        # sleep 70s
+        self.migrateDbS3()
+
+        # check upload to s3
+        self.checkUploadToS3()
+
+    def checkStreamCorrect(self):
+        sql = f"select count(*) from {self.db}.stm1"
+        count = 0
+        for i in range(120):
+            tdSql.query(sql)
+            count = tdSql.getData(0, 0)
+            if count == 100000 or count == 100001:
+                return True
+            time.sleep(1)
+            
+        tdLog.exit(f"stream count is not expect . expect = 100000 or 100001 real={count} . sql={sql}")
+
+
+    def checkCreateDb(self, keepLocal, chunkSize, compact):
+        # keyword
+        kw1 = kw2 = kw3 = "" 
+        if keepLocal is not None:
+            kw1 = f"s3_keeplocal {keepLocal}"
+        if chunkSize is not None:
+            kw2 = f"s3_chunksize {chunkSize}"
+        if compact is not None:
+            kw3 = f"s3_compact {compact}"    
+
+        sql = f" create database db1 duration 1h {kw1} {kw2} {kw3}"
+        tdSql.execute(sql, show=True)
+        #sql = f"select name,s3_keeplocal,s3_chunksize,s3_compact from information_schema.ins_databases where name='db1';"
+        sql = f"select * from information_schema.ins_databases where name='db1';"
+        tdSql.query(sql)
+        # 29 30 31 -> chunksize keeplocal compact
+        if chunkSize is not None:
+            tdSql.checkData(0, 29, chunkSize)
+        if keepLocal is not None:
+            keepLocalm = keepLocal * 24 * 60
+            tdSql.checkData(0, 30, f"{keepLocalm}m")
+        if compact is not None:    
+            tdSql.checkData(0, 31, compact)
+        sql = "drop database db1"
+        tdSql.execute(sql)
+
+    def checkExcept(self):
+        # errors
+        sqls = [
+            f"create database db2 s3_keeplocal -1",
+            f"create database db2 s3_keeplocal 0",
+            f"create database db2 s3_keeplocal 365001",
+            f"create database db2 s3_chunksize -1",
+            f"create database db2 s3_chunksize 0",
+            f"create database db2 s3_chunksize 900000000",
+            f"create database db2 s3_compact -1",
+            f"create database db2 s3_compact 100",
+            f"create database db2 duration 1d s3_keeplocal 1d"
+        ]
+        tdSql.errors(sqls)
+
+
+    def checkBasic(self):
+        # create db
+        keeps  = [1, 256, 1024, 365000, None]
+        chunks = [131072, 600000, 820000, 1048576, None]
+        comps  = [0, 1, None]
+
+        for keep in keeps:
+            for chunk in chunks:
+                for comp in comps:
+                    self.checkCreateDb(keep, chunk, comp)
+
+        
+        # --checks3
+        idx = 1
+        taosd = sc.taosdFile(idx)
+        cfg   = sc.dnodeCfgPath(idx)
+        cmd = f"{taosd} -c {cfg} --checks3"
+
+        eos.exe(cmd)
+        #output, error = eos.run(cmd)
+        #print(lines)
+
+        '''
+        tips = [
+            "put object s3test.txt: success",
+            "listing bucket ci-bucket: success",
+            "get object s3test.txt: success",
+            "delete object s3test.txt: success"
+        ]
+        pos = 0
+        for tip in tips:
+            pos = output.find(tip, pos)
+            #if pos == -1:
+            #    tdLog.exit(f"checks3 failed not found {tip}. cmd={cmd} output={output}")
+        '''
+        
+        # except
+        self.checkExcept()
+
+    #
+    def preDb(self, vgroups):
+        cnt = int(time.time())%2 + 1
+        for i in range(cnt):
+             vg = eutil.cpuRand(9) + 1
+             sql = f"create database predb vgroups {vg}"
+             tdSql.execute(sql, show=True)
+             sql = "drop database predb"
+             tdSql.execute(sql, show=True)
+
+    # history
+    def insertHistory(self):
+        tdLog.info(f"insert history data.")
+        # taosBenchmark run
+        json = etool.curFile(__file__, "s3Basic1.json")
+        etool.benchMark(json=json)
+
+        # come from s3_basic.json
+        self.insert_rows += self.insert_rows/4
+        self.timestamp_step = 50
+
+    # delete
+    def checkDelete(self):
+        # del 1000 rows
+        start = 1600000000000
+        drows = 200
+        for i in range(1, drows, 2):
+            sql = f"from {self.db}.{self.stb} where ts = {start + i*500}"
+            tdSql.execute("delete " + sql, show=True)
+            tdSql.query("select * " + sql)
+            tdSql.checkRows(0)
+        
+        # delete all 500 step
+        self.flushDb()
+        self.compactDb()
+        self.insert_rows   -= drows/2
+        sql = f"select count(*) from {self.db}.{self.stb}"
+        tdSql.checkAgg(sql, self.insert_rows * self.childtable_count)
+
+        # delete 10W rows from 100000
+        drows = 100000
+        sdel = start + 100000 * self.timestamp_step
+        edel = start + 100000 * self.timestamp_step + drows * self.timestamp_step
+        sql = f"from {self.db}.{self.stb} where ts >= {sdel} and ts < {edel}"
+        tdSql.execute("delete " + sql, show=True)
+        tdSql.query("select * " + sql)
+        tdSql.checkRows(0)
+
+        self.insert_rows   -= drows
+        sql = f"select count(*) from {self.db}.{self.stb}"
+        tdSql.checkAgg(sql, self.insert_rows * self.childtable_count)
+        
+
+    # run
+    def run(self):
+        tdLog.debug(f"start to excute {__file__}")
+        self.sname = "stream1"
+        if eos.isArm64Cpu():
+            tdLog.success(f"{__file__} arm64 ignore executed")
+        else:
+            
+            self.preDb(10)
+
+            # insert data
+            self.insertData()
+
+            # creat stream
+            self.createStream(self.sname)
+
+            # check insert data correct
+            #self.checkInsertCorrect()
+
+            # save
+            self.snapshotAgg()
+
+            # do action
+            self.doAction()
+
+            # check save agg result correct
+            self.checkAggCorrect()
+
+            # check insert correct again
+            self.checkInsertCorrect()
+
+            # checkBasic
+            self.checkBasic()
+
+            # check stream correct and drop stream
+            #self.checkStreamCorrect()
+
+            # drop stream
+            self.dropStream(self.sname)
+
+            # insert history  disorder data
+            self.insertHistory()
+            #self.checkInsertCorrect()
+            self.snapshotAgg()
+            self.doAction()
+            self.checkAggCorrect()
+            self.checkInsertCorrect(difCnt=self.childtable_count*1499999)
+            self.checkDelete()
+            self.doAction()
+
+            # drop database and free s3 file
+            self.dropDb()
+
+
+            tdLog.success(f"{__file__} successfully executed")
+
+        
+
+tdCases.addLinux(__file__, TDTestCase())
+tdCases.addWindows(__file__, TDTestCase())
diff --git a/tests/army/storage/s3/s3Basic1.json b/tests/army/storage/s3/s3Basic1.json
new file mode 100644
index 0000000000..0618c341c9
--- /dev/null
+++ b/tests/army/storage/s3/s3Basic1.json
@@ -0,0 +1,66 @@
+{
+    "filetype": "insert",
+    "cfgdir": "/etc/taos",
+    "host": "127.0.0.1",
+    "port": 6030,
+    "user": "root",
+    "password": "taosdata",
+    "connection_pool_size": 8,
+    "num_of_records_per_req": 5000,
+    "prepared_rand": 500,
+    "thread_count": 4,
+    "create_table_thread_count": 1,
+    "confirm_parameter_prompt": "no",
+    "databases": [
+        {
+            "dbinfo": {
+                "name": "db",
+                "drop": "no",
+                "vgroups": 2,
+                "replica": 1,
+                "duration":"10d",
+                "s3_keeplocal":"30d", 
+                "s3_chunksize":"131072",
+                "tsdb_pagesize":"1",
+                "s3_compact":"1",
+                "wal_retention_size":"1",
+                "wal_retention_period":"1",
+                "flush_each_batch":"no",
+                "keep": "3650d"
+            },
+            "super_tables": [
+                {
+                    "name": "stb",
+                    "child_table_exists": "yes",
+                    "childtable_count": 6,
+                    "insert_rows": 1000000,
+                    "childtable_prefix": "d",
+                    "insert_mode": "taosc",
+                    "timestamp_step": 50,
+                    "start_timestamp": 1600000000000,
+                    "columns": [
+                        { "type": "bool",        "name": "bc"},
+                        { "type": "float",       "name": "fc" },
+                        { "type": "double",      "name": "dc"},
+                        { "type": "tinyint",     "name": "ti"},
+                        { "type": "smallint",    "name": "si" },
+                        { "type": "int",         "name": "ic" ,"max": 1,"min": 1},
+                        { "type": "bigint",      "name": "bi" },
+                        { "type": "utinyint",    "name": "uti"},
+                        { "type": "usmallint",   "name": "usi"},
+                        { "type": "uint",        "name": "ui" },
+                        { "type": "ubigint",     "name": "ubi"},
+                        { "type": "binary",      "name": "bin", "len": 32},
+                        { "type": "nchar",       "name": "nch", "len": 64}
+                    ],
+                    "tags": [
+                        {"type": "tinyint", "name": "groupid","max": 10,"min": 1},
+                        {"name": "location","type": "binary", "len": 16, "values":
+                           ["San Francisco", "Los Angles", "San Diego", "San Jose", "Palo Alto", "Campbell", "Mountain View","Sunnyvale", "Santa Clara", "Cupertino"]
+                        }
+                    ]
+                }
+            ]
+        }
+    ]
+}