branch detection, stability

Jonicod9 · Mar 26, 2020 · 7e24e49 · 7e24e49
1 parent 3b1c7b9
commit 7e24e49
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/example-pipelines/example-create/Jenkinsfile b/example-pipelines/example-create/Jenkinsfile
@@ -20,6 +20,7 @@ pipeline {
   }
   stages {
     stage('TF init & validate') {
+      when { anyOf {branch "prod";branch "dev";changeRequest() } }
       steps {
         container('terraform') {
           sh '''cd example-pipelines/example-create
@@ -29,6 +30,7 @@ pipeline {
       }
     }
     stage('TF plan') {
+      when { anyOf {branch "prod";branch "dev";changeRequest() } }
       steps {
         container('terraform') {
           sh '''cd example-pipelines/example-create
@@ -37,15 +39,15 @@ pipeline {
       }
     }
     stage('Wait for Appproval') {
-      when { branch "master" }
+      when { anyOf {branch "prod";branch "dev" } }
       steps {
         script {
           def userInput = input(id: 'confirm', message: 'Apply Terraform?', parameters: [ [$class: 'BooleanParameterDefinition', defaultValue: false, description: 'Apply terraform', name: 'confirm'] ])
         }
       }
     }
     stage('TF Apply') {
-      when { branch "master" }
+      when { anyOf {branch "prod";branch "dev" } }
       steps {
         container('terraform') {
           sh '''cd example-pipelines/example-create

diff --git a/jenkins-gke/jenkins-helm/values.yaml b/jenkins-gke/jenkins-helm/values.yaml
@@ -114,9 +114,8 @@ master:
                                 - emptyDirVolume:
                                     memory: false
                                     mountPath: "/tmp"
-                              idleMinutes: "1"
                               podRetention: "never"
-                              activeDeadlineSeconds: "240"
+                              activeDeadlineSeconds: "300"
                               slaveConnectTimeout: "1000"
         credentials: |
             credentials:
@@ -147,7 +146,7 @@ master:
                             buildOriginBranchWithPR(false)
                             buildOriginBranch(true)
                             buildOriginPRMerge(true)
-                            buildForkPRMerge(true)
+                            includes("dev prod PR*")
                         }
                         }
                         orphanedItemStrategy {