From 8ec889a9f7fbdff3503d15da69d405ee8a0873cc Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Thu, 5 May 2022 11:19:29 +0200
Subject: [PATCH] Jenkinsfile fixes

---
 Jenkinsfile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 580ac0bf..86498598 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -28,8 +28,10 @@ pipeline {
         }
         stage('Package') {
             when {
-                branch 'master'
-                branch 'test'
+                anyOf {
+                    branch 'master'
+                    branch 'test'
+                }
             }
             agent {
                 docker {
@@ -46,8 +48,10 @@ pipeline {
         }
         stage('Build') {
             when {
-                branch 'master'
-                branch 'test'
+                anyOf {
+                    branch 'master'
+                    branch 'test'
+                }
             }
             environment {
                 CREDS = credentials('docker-registry')
@@ -60,8 +64,10 @@ pipeline {
         }
         stage('Deploy') {
             when {
-                branch 'master'
-                branch 'test'
+                anyOf {
+                    branch 'master'
+                    branch 'test'
+                }
             }
             environment {
                 DOCKER_HOST = "${env.SWARM_HOST}"