diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index debb523e514a989b8b0935a0c122ccd105d53138..bc2fcf834e0ca0f25524a5427fc8720781e40c40 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -11,8 +11,7 @@ pipeline { triggers { upstream(upstreamProjects: getUpstreamProjects(), threshold: hudson.model.Result.SUCCESS) - cron('46 18-23,0-5 * * *') - + cron('55 * * * *') } environment { @@ -35,60 +34,9 @@ pipeline { } stages { -// stage('Checkout build trigger') { -// when { -// not { -// anyOf { -// triggeredBy 'UpstreamCause' -// triggeredBy 'BuildUpstreamCause' -// triggeredBy cause: 'UserIdCause' -// triggeredBy 'CronCause' -// triggeredBy 'TimerTrigger' -// } -// } -// } -// steps { -// script { -// SKIP_RUN = true -// currentBuild.result= "UNSTABLE" -// } -// } -// } - // stage('Check branch') { -// when { - // anyOf { -// triggeredBy 'CronCause' -// triggeredBy 'TimerTrigger' -// } -// } - // steps { - // script { - // if (!isMasterBranch()) { - // echo "Branchname "+env.BRANCH_NAME+" does not match, skipping e2e tests" - // SKIP_RUN = true - // } - // } - // } - // } - stage('TimerTrigger') { - when { - triggeredBy 'TimerTrigger' - } - steps { - echo "TimerTrigger" - } - } - stage('UserIdCause') { - when { - triggeredBy cause: 'UserIdCause' - } - steps { - echo "UserIdCause" - } - } - stage('When not anyOf') { - when { - not { + stage('Checkout build trigger') { + when { + not { anyOf { triggeredBy 'UpstreamCause' triggeredBy 'BuildUpstreamCause' @@ -96,9 +44,25 @@ pipeline { triggeredBy 'TimerTrigger' } } + } + steps { + script { + SKIP_RUN = true + currentBuild.result= "UNSTABLE" + } + } + } + stage('Check branch') { + when { + triggeredBy 'TimerTrigger' } steps { - echo "When not anyOf" + script { + if (!isMasterBranch()) { + echo "Branchname "+env.BRANCH_NAME+" does not match, skipping e2e tests" + SKIP_RUN = true + } + } } } stage('Checkout SCM') {