Merge pull request #180 from GoogleCloudPlatform/cgrant-or-main

Support use of Main branch as well as Master
GoogleCloudPlatform · Aug 19, 2022 · 59676d8 · 59676d8
2 parents 2d266b6 + 321f730
commit 59676d8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/sample-app/Jenkinsfile b/sample-app/Jenkinsfile
@@ -76,7 +76,12 @@ spec:
     }
     stage('Deploy Production') {
       // Production branch
-      when { branch 'master' }
+      when { 
+        anyOf { 
+          branch 'main' 
+          branch 'master' 
+        }
+      }
       steps{
         container('kubectl') {
         // Change deployed image in canary to the one we just built
@@ -90,6 +95,7 @@ spec:
     stage('Deploy Dev') {
       // Developer Branches
       when {
+        not { branch 'main' }
         not { branch 'master' }
         not { branch 'canary' }
       }