From 34b5d83fd23f5bf5248c99b579f5e576e79d5ce0 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Wed, 15 Sep 2021 14:49:33 +0800 Subject: [PATCH] update jenkins --- Jenkinsfile | 12 ++++++------ tests/pytest/update/merge_commit_data2_update0.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 3524a82151..25bfb41122 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -336,12 +336,12 @@ pipeline { ''' } timeout(time: 60, unit: 'MINUTES'){ - sh ''' - cd ${WKC}/tests/pytest - rm -rf /var/lib/taos/* - rm -rf /var/log/taos/* - ./handle_crash_gen_val_log.sh - ''' + // sh ''' + // cd ${WKC}/tests/pytest + // rm -rf /var/lib/taos/* + // rm -rf /var/log/taos/* + // ./handle_crash_gen_val_log.sh + // ''' sh ''' cd ${WKC}/tests/pytest rm -rf /var/lib/taos/* diff --git a/tests/pytest/update/merge_commit_data2_update0.py b/tests/pytest/update/merge_commit_data2_update0.py index def50e0466..7e3c65a0a2 100644 --- a/tests/pytest/update/merge_commit_data2_update0.py +++ b/tests/pytest/update/merge_commit_data2_update0.py @@ -27,7 +27,7 @@ class TDTestCase: def restart_taosd(self,db): tdDnodes.stop(1) - tdDnodes.startWithoutSleep(1) + tdDnodes.start(1) tdSql.execute("use %s;" % db) def date_to_timestamp_microseconds(self, date): -- GitLab