ci_: configure test jobs (#6008)
This commit is contained in:
parent
5d4838a752
commit
7617bdd2ef
|
@ -22,7 +22,7 @@ pipeline {
|
||||||
)
|
)
|
||||||
booleanParam(
|
booleanParam(
|
||||||
name: 'UNIT_TEST_RERUN_FAILS',
|
name: 'UNIT_TEST_RERUN_FAILS',
|
||||||
defaultValue: isPRJob(),
|
defaultValue: !isNightlyJob(),
|
||||||
description: 'Should the job rerun failed tests?'
|
description: 'Should the job rerun failed tests?'
|
||||||
)
|
)
|
||||||
booleanParam(
|
booleanParam(
|
||||||
|
@ -56,7 +56,7 @@ pipeline {
|
||||||
/* manage how many builds we keep */
|
/* manage how many builds we keep */
|
||||||
buildDiscarder(logRotator(
|
buildDiscarder(logRotator(
|
||||||
numToKeepStr: getAmountToKeep(),
|
numToKeepStr: getAmountToKeep(),
|
||||||
daysToKeepStr: '30',
|
daysToKeepStr: '-1',
|
||||||
artifactNumToKeepStr: getAmountToKeep(),
|
artifactNumToKeepStr: getAmountToKeep(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
@ -254,4 +254,4 @@ def getDefaultUnitTestCount() { isNightlyJob() ? '20' : '1' }
|
||||||
|
|
||||||
def getDefaultTimeout() { isNightlyJob() ? 5*60 : 50 }
|
def getDefaultTimeout() { isNightlyJob() ? 5*60 : 50 }
|
||||||
|
|
||||||
def getAmountToKeep() { isNightlyJob() ? '14' : isDevelopJob() ? '10' : '5' }
|
def getAmountToKeep() { isNightlyJob() ? '14' : isDevelopJob() ? '30' : '5' }
|
|
@ -24,9 +24,9 @@ pipeline {
|
||||||
disableConcurrentBuilds()
|
disableConcurrentBuilds()
|
||||||
/* manage how many builds we keep */
|
/* manage how many builds we keep */
|
||||||
buildDiscarder(logRotator(
|
buildDiscarder(logRotator(
|
||||||
numToKeepStr: '5',
|
numToKeepStr: getAmountToKeep(),
|
||||||
daysToKeepStr: '30',
|
daysToKeepStr: '-1',
|
||||||
artifactNumToKeepStr: '1',
|
artifactNumToKeepStr: getAmountToKeep(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -74,3 +74,7 @@ pipeline {
|
||||||
cleanup { sh 'make git-clean' }
|
cleanup { sh 'make git-clean' }
|
||||||
} // post
|
} // post
|
||||||
} // pipeline
|
} // pipeline
|
||||||
|
|
||||||
|
def isDevelopJob() { env.JOB_BASE_NAME == 'tests-rpc-develop' }
|
||||||
|
|
||||||
|
def getAmountToKeep() { isDevelopJob() ? '30' : '5' }
|
Loading…
Reference in New Issue