Merge remote-tracking branch 'origin/master' into OZG-5274-xDomea-Datei--Nachrichten

alfa-client/apps/alfa-e2e/Jenkinsfile

@@ -10,9 +10,8 @@ pipeline {
     }
 
     triggers {
-        upstream(upstreamProjects: getUpstreamProjects(), threshold: hudson.model.Result.SUCCESS)
-        cron('46 18-23,0-5 * * *')
-
+        // upstream(upstreamProjects: getUpstreamProjects(), threshold: hudson.model.Result.SUCCESS)
+        cron('0 18-23,0-5 * * *')
     }
 
     environment {
@@ -35,32 +34,28 @@ 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('Checkout build trigger') {
+           when {
+               not {
+                   anyOf {
+                       triggeredBy 'UpstreamCause'
+                       triggeredBy 'BuildUpstreamCause'
+                       triggeredBy cause: 'UserIdCause'
+                       triggeredBy 'TimerTrigger'
+                   }
+               }
+           }
+           steps {
+               script {
+                  SKIP_RUN = true
+                   currentBuild.result= "UNSTABLE"
+               }
+           }
+       }
         stage('Check branch') {
-//            when {
- //               anyOf {
-//                    triggeredBy 'CronCause'
-//                    triggeredBy 'TimerTrigger'
-//                }
-//            }
+            when { 
+                triggeredBy 'TimerTrigger' 
+            }
             steps {
                 script {
                      if (!isMasterBranch()) {