Update Jenkinsfile (#112)

* Update Jenkinsfile
provectus · Nov 10, 2020 · 3350c1f · 3350c1f
1 parent cee189a
commit 3350c1f
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -70,6 +70,9 @@ spec:
             }
         }
         stage('Remove SNAPSHOT from version') {
+            when {
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
+            }
             steps {
                 container('docker-client') {
                     sh "docker run -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven maven:3.6.3-jdk-13 bash -c 'mvn versions:set -DremoveSnapshot'"
@@ -88,6 +91,12 @@ spec:
             }
         }
         stage('Build artifact') {
+            when {
+                anyOf {
+                    changeRequest ()
+                    expression { return env.GIT_BRANCH ==~ /.*master$/; }
+                }
+            }
             steps {
                 container('docker-client') {
                     sh "docker run -v /var/run/docker.sock:/var/run/docker.sock -v $WORKSPACE:/usr/src/mymaven -v /tmp/repository:/root/.m2/repository -w /usr/src/mymaven provectuslabs/openjdk:13 bash -c 'chown -R \$(whoami):\$(whoami) kafka-ui-react-app && ./mvnw clean package -Pprod'"
@@ -96,7 +105,7 @@ spec:
         }
         stage('Build docker image') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
             }
             steps {
                 container('docker-client') {
@@ -110,7 +119,7 @@ spec:
         }
         stage('Publish docker image') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
             }
             steps {
                 container('docker-client') {
@@ -125,7 +134,7 @@ spec:
         }
         stage('Remove unused docker image') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
             }
             steps{
                 container('docker-client') {
@@ -135,7 +144,7 @@ spec:
         }
         stage('Create github release with text from commits') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
             }
             steps {
                 script {
@@ -150,15 +159,15 @@ spec:
         }
         stage('Checkout master') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
             }
             steps {
                 sh 'git checkout master'
             }
         }
         stage('Increase version in master') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
             }
             steps {
                 container('docker-client') {
@@ -168,7 +177,7 @@ spec:
         }
         stage('Push to master') {
             when {
-                expression { return env.GIT_BRANCH == 'master'; }
+                expression { return env.GIT_BRANCH ==~ /.*master$/; }
             }
             steps {
                 script {