From ac66847162dd592c97c80870ab93388eed4d3c3d Mon Sep 17 00:00:00 2001
From: Rustam Tagaev <rustam.tagaev@avroid.team>
Date: Tue, 4 Mar 2025 13:47:23 +0300
Subject: [PATCH] [DO-0]  fix bug `Cannot invoke method contains() on null
 object` (!91)

Co-authored-by: Rustam Tagaev <rustam.tagaev@avroid.tech>
Reviewed-on: https://git.avroid.tech/DevOps/jenkins-pipelines/pulls/91
Reviewed-by: Vasiliy Chipizhin <vasiliy.chipizhin@avroid.team>
---
 pipelines/Cloud/Apps-Backend/msg-files.groovy              | 4 ++--
 pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy | 4 ++--
 pipelines/Cloud/Apps-Backend/msg-profiles.groovy           | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pipelines/Cloud/Apps-Backend/msg-files.groovy b/pipelines/Cloud/Apps-Backend/msg-files.groovy
index d8de856..dfd70cb 100644
--- a/pipelines/Cloud/Apps-Backend/msg-files.groovy
+++ b/pipelines/Cloud/Apps-Backend/msg-files.groovy
@@ -78,14 +78,14 @@ slaveTemplates.jnlp {
                                     "--build-arg PIP_INDEX_URL=${env.JENKINS_PIP_INDEX_URL} -f Dockerfile ."
                                 )
 
-                                if (publishBranch.contains(branch)) {
+                                if (publishBranch != null && publishBranch.contains(branch)) {
                                     buildImage.push()
                                 }
                             }
                         }
 
                         stage('deploy application'){
-                            if (publishBranch.contains(branch)){
+                            if (publishBranch != null && publishBranch.contains(branch)){
                                 build job: 'Cloud/Deploy/Backend/msg-files-deploy',
                                       parameters: [
                                           string(name: 'ENV', value: envBranch.find { it.value == branch }?.key ),
diff --git a/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy b/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy
index 79f980f..b97eb4b 100644
--- a/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy
+++ b/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy
@@ -79,14 +79,14 @@ slaveTemplates.jnlp {
                                     "--build-arg PIP_INDEX_URL=${env.JENKINS_PIP_INDEX_URL} -f Dockerfile ."
                                 )
 
-                                if (publishBranch) {
+                                if (publishBranch != null && publishBranch.contains(branch)) {
                                     buildImage.push()
                                 }
                             }
                         }
 
                         stage('deploy application'){
-                            if (publishBranch){
+                            if (publishBranch != null && publishBranch.contains(branch)){
                                 build job: 'Cloud/Deploy/Backend/msg-messenger-core-api-deploy',
                                       parameters: [
                                           string(name: 'ENV', value: envBranch.find { it.value == branch }?.key ),
diff --git a/pipelines/Cloud/Apps-Backend/msg-profiles.groovy b/pipelines/Cloud/Apps-Backend/msg-profiles.groovy
index 6e2be5b..6c8f8bc 100644
--- a/pipelines/Cloud/Apps-Backend/msg-profiles.groovy
+++ b/pipelines/Cloud/Apps-Backend/msg-profiles.groovy
@@ -78,14 +78,14 @@ slaveTemplates.jnlp {
                                     "--build-arg PIP_INDEX_URL=${env.JENKINS_PIP_INDEX_URL} -f Dockerfile ."
                                 )
 
-                                if (publishBranch.contains(branch)) {
+                                if (publishBranch != null && publishBranch.contains(branch)) {
                                     buildImage.push()
                                 }
                             }
                         }
 
                         stage('deploy application'){
-                            if (publishBranch.contains(branch)){
+                            if (publishBranch != null && publishBranch.contains(branch)){
                                 build job: 'Cloud/Deploy/Backend/msg-messenger-deploy',
                                       parameters: [
                                           string(name: 'ENV', value: envBranch.find { it.value == branch }?.key ),