Use anyOf for simplicity

korlaxxalrok · dshemetov · commit d3e44ce4a264 · 2021-04-27T13:26:34.000-07:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -19,7 +19,10 @@ pipeline {
     stages {
         stage('Build and Package') {
             when {
+                anyOf {
                 branch "main";
+                branch "main-nan-testing";
+                }
             }
             steps {
                 script {
@@ -34,7 +37,10 @@ pipeline {
         }
         stage('Deploy staging') {
             when {
+                anyOf {
                 branch "main";
+                branch "main-nan-testing";
+                }
             }
             steps {
                 script {
@@ -51,6 +57,7 @@ pipeline {
         stage('Deploy staging [main-nan-testing]') {
             when {
                 branch "main-nan-testing";
+                }
             }
             steps {
                 script {
@@ -61,6 +68,7 @@ pipeline {
                     }
                     parallel deploy_staging
                 }
+                sh "jenkins/deploy-staging-api-match-list.sh"
             }
         }
         stage('Deploy production') {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,10 @@ pipeline {`
`19`	`19`	`stages {`
`20`	`20`	`stage('Build and Package') {`
`21`	`21`	`when {`
	`22`	`+ anyOf {`
`22`	`23`	`branch "main";`
	`24`	`+ branch "main-nan-testing";`
	`25`	`+ }`
`23`	`26`	`}`
`24`	`27`	`steps {`
`25`	`28`	`script {`
`@@ -34,7 +37,10 @@ pipeline {`
`34`	`37`	`}`
`35`	`38`	`stage('Deploy staging') {`
`36`	`39`	`when {`
	`40`	`+ anyOf {`
`37`	`41`	`branch "main";`
	`42`	`+ branch "main-nan-testing";`
	`43`	`+ }`
`38`	`44`	`}`
`39`	`45`	`steps {`
`40`	`46`	`script {`
`@@ -51,6 +57,7 @@ pipeline {`
`51`	`57`	`stage('Deploy staging [main-nan-testing]') {`
`52`	`58`	`when {`
`53`	`59`	`branch "main-nan-testing";`
	`60`	`+ }`
`54`	`61`	`}`
`55`	`62`	`steps {`
`56`	`63`	`script {`
`@@ -61,6 +68,7 @@ pipeline {`
`61`	`68`	`}`
`62`	`69`	`parallel deploy_staging`
`63`	`70`	`}`
	`71`	`+ sh "jenkins/deploy-staging-api-match-list.sh"`
`64`	`72`	`}`
`65`	`73`	`}`
`66`	`74`	`stage('Deploy production') {`