Merge #1262 Make pipeline job options consistent

This commit is contained in:
Matt Prahl
2019-05-21 12:55:45 +00:00
6 changed files with 17 additions and 0 deletions

View File

@@ -42,6 +42,7 @@ pipeline {
timestamps()
timeout(time: 120, unit: 'MINUTES')
buildDiscarder(logRotator(numToKeepStr: '10'))
disableConcurrentBuilds()
skipDefaultCheckout()
}
environment {

View File

@@ -1,6 +1,10 @@
// Use scripted syntax because CIBuildTrigger currently doesn't support the declarative syntax
properties([
timestamps(),
timeout(time: 30, unit: 'MINUTES'),
buildDiscarder(logRotator(numToKeepStr: '10')),
disableConcurrentBuilds(),
skipDefaultCheckout(),
pipelineTriggers([
// example: https://github.com/jenkinsci/jms-messaging-plugin/blob/9b9387c3a52f037ba0d019c2ebcf2a2796fc6397/src/test/java/com/redhat/jenkins/plugins/ci/integration/AmqMessagingPluginIntegrationTest.java
[$class: 'CIBuildTrigger',

View File

@@ -38,6 +38,9 @@ pipeline {
options {
timestamps()
timeout(time: 30, unit: 'MINUTES')
buildDiscarder(logRotator(numToKeepStr: '10'))
disableConcurrentBuilds()
skipDefaultCheckout()
}
environment {
PIPELINE_NAMESPACE = readFile(file: '/run/secrets/kubernetes.io/serviceaccount/namespace').trim()

View File

@@ -41,6 +41,7 @@ pipeline {
timestamps()
timeout(time: 60, unit: 'MINUTES')
buildDiscarder(logRotator(numToKeepStr: '10'))
disableConcurrentBuilds()
skipDefaultCheckout()
}
environment {

View File

@@ -123,6 +123,10 @@ objects:
}
options {
timestamps()
timeout(time: 60, unit: 'MINUTES')
buildDiscarder(logRotator(numToKeepStr: '10'))
disableConcurrentBuilds()
skipDefaultCheckout()
}
environment {
PIPELINE_NAMESPACE = readFile('/run/secrets/kubernetes.io/serviceaccount/namespace').trim()

View File

@@ -1,6 +1,10 @@
// Use scripted syntax because CIBuildTrigger currently doesn't support the declarative syntax
properties([
timestamps(),
timeout(time: 30, unit: 'MINUTES'),
buildDiscarder(logRotator(numToKeepStr: '10')),
disableConcurrentBuilds(),
skipDefaultCheckout(),
pipelineTriggers([
// example: https://github.com/jenkinsci/jms-messaging-plugin/blob/9b9387c3a52f037ba0d019c2ebcf2a2796fc6397/src/test/java/com/redhat/jenkins/plugins/ci/integration/AmqMessagingPluginIntegrationTest.java
[$class: 'CIBuildTrigger',