Use anyOf for simplicity

Author: korlaxxalrok

Jenkinsfile

@@ -19,7 +19,10 @@ pipeline {
     stages {
         stage('Build and Package') {
             when {
+                anyOf {
                 branch "main";
+                branch "main-nan-testing";
+                }
             }
             steps {
                 script {
@@ -34,23 +37,10 @@ pipeline {
         }
         stage('Deploy staging') {
             when {
+                anyOf {
                 branch "main";
-            }
-            steps {
-                script {
-                    indicator_list.each { indicator ->
-                        deploy_staging[indicator] = {
-                            sh "jenkins/deploy-staging.sh ${indicator}"
-                        }
-                    }
-                    parallel deploy_staging
-                }
-                sh "jenkins/deploy-staging-api-match-list.sh"
-            }
-        }
-        stage('Deploy staging [main-nan-testing]') {
-            when {
                 branch "main-nan-testing";
+                }
             }
             steps {
                 script {
@@ -61,6 +51,7 @@ pipeline {
                     }
                     parallel deploy_staging
                 }
+                sh "jenkins/deploy-staging-api-match-list.sh"
             }
         }
         stage('Deploy production') {