diff --git a/Jenkinsfile b/Jenkinsfile index 685fde662db40c234cd160dd4334d91df75e5a1a..a78851fd900339b473e6f5df65a0160d25a47331 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 4f126371b9afa7d29ca697cb09acc2e4f16d232e..162aa3eb658a60615c9f20de0c363f9066096f0c 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 :