diff --git a/alfa-client/apps/alfa-e2e/Jenkinsfile b/alfa-client/apps/alfa-e2e/Jenkinsfile index 6afc59fda12b3365f1ee7a7011c028aa40c90a1d..debb523e514a989b8b0935a0c122ccd105d53138 100644 --- a/alfa-client/apps/alfa-e2e/Jenkinsfile +++ b/alfa-client/apps/alfa-e2e/Jenkinsfile @@ -54,20 +54,51 @@ pipeline { // } // } // } - stage('Check branch') { + // 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 { - script { - if (!isMasterBranch()) { - echo "Branchname "+env.BRANCH_NAME+" does not match, skipping e2e tests" - SKIP_RUN = true - } - } + echo "TimerTrigger" + } + } + stage('UserIdCause') { + when { + triggeredBy cause: 'UserIdCause' + } + steps { + echo "UserIdCause" + } + } + stage('When not anyOf') { + when { + not { + anyOf { + triggeredBy 'UpstreamCause' + triggeredBy 'BuildUpstreamCause' + triggeredBy cause: 'UserIdCause' + triggeredBy 'TimerTrigger' + } + } + } + steps { + echo "When not anyOf" } } stage('Checkout SCM') {