From 2edf9f641ca3ecc4399dbf2c76361b7c64120567 Mon Sep 17 00:00:00 2001
From: Mali Bayhan <mali.bayhan@globalrelay.net>
Date: Fri, 10 Dec 2021 08:54:38 -0800
Subject: [PATCH] pact-test Sync Repo

---
 Jenkinsfile | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 35789cb..c8da386 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -3,6 +3,10 @@ def MAVEN_IMAGE = 'maven:3.8.2-openjdk-11-slim'
 pipeline {
     agent any
 
+    environment {
+        BRANCH_NAME = env.GIT_BRANCH.replace('origin/', '')
+    }
+
     stages {
         stage('Build') {
             agent {
@@ -24,19 +28,6 @@ pipeline {
         }
 
         stage('Static Code Analysis') {
-            // docker:start
-            // agent {
-            //     docker {
-            //         image 'sonarsource/sonar-scanner-cli'
-            //     }
-            // }
-            // steps {
-            //     withSonarQubeEnv('cicd') {
-            //         echo '################# MAVEN ###################'
-            //         sh 'sonar-scanner -Dsonar.projectKey=sonarqubejava:multimodule -Dsonar.sources=. -Dsonar.java.binaries=.'
-            //     }
-            // }
-            // docker:end
 
             // maven:start
             agent {
@@ -45,17 +36,22 @@ pipeline {
                 }
             }
 
+            
+
+            // maven:end
+        }
+
+        stage('Pact') {
             steps {
                 withSonarQubeEnv('cicd') {
                     echo '################# MAVEN ###################'
+                    sh 'echo ${GIT_BRANCH} ${BRANCH_NAME}'
                     sh 'mvn sonar:sonar'
                     echo '############### MAVEN END #################'
                 }
 
                 sh 'mvn pact:publish -Dpact.consumer.version=${GIT_COMMIT} -Dpact.tag=${BRANCH_NAME}'
             }
-
-        // maven:end
         }
     }
 }