From 683b1282b8a5b5f544104d8a291fba90958de3d6 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Wed, 17 Mar 2021 14:28:36 +0800
Subject: [PATCH] abort build

---
 Jenkinsfile                                   | 8 +++++++-
 tests/pytest/functions/function_operations.py | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 685fde662d..a78851fd90 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -24,7 +24,13 @@ def abortPreviousBuilds() {
     build.doKill()    //doTerm(),doKill(),doTerm()
   }
 }
-
+//abort previous build
+abortPreviousBuilds()
+def abort_previous(){
+  def buildNumber = env.BUILD_NUMBER as int
+  if (buildNumber > 1) milestone(buildNumber - 1)
+  milestone(buildNumber)
+}
 def pre_test(){
     catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
                 sh '''
diff --git a/tests/pytest/functions/function_operations.py b/tests/pytest/functions/function_operations.py
index 4f126371b9..162aa3eb65 100644
--- a/tests/pytest/functions/function_operations.py
+++ b/tests/pytest/functions/function_operations.py
@@ -92,7 +92,7 @@ class TDTestCase:
         col_list = [ 'col1' , 'col2' , 'col3' , 'col4' , 'col5' , 'col6' , 'col7' , 'col8' , 'col9' , 'col11' , 'col12' , 'col13' , 'col14' , '1' , '1.1' , 'NULL' ]
         op_list = [ '+' , '-' , '*' , '/' , '%' ]
         err_list = [ 'col7' , 'col8' , 'col9' , 'NULL' ]
-        order_lsit = [ ' order by ts ', ' order by ts desc ', ' order by ts asc']
+        order_lsit = [ ' order by ts ', ' order by ts desc ', ' order by ts asc ']
         for i in col_list :
             for j in col_list :
                 for k in op_list :
-- 
GitLab