master- Sync Repo

jenkins/cd/Jenkinsfile

@@ -1,15 +1,20 @@
 #!groovy
-pipeline {
+def MAVEN_IMAGE = 'maven:3.8.2-openjdk-11-slim'
 
-  agent any
+pipeline {
+  agent {
+        docker {
+      image "${MAVEN_IMAGE}"
+        }
+  }
 
   stages {
     stage ('Build') {
       steps {
         dir('user-service') {
-          sh "../mvnw clean verify " +
+          sh 'mvn clean verify ' +
                   "-Dpact.provider.version=${GIT_COMMIT} " +
-                  "-Dpact.verifier.publishResults=true"
+                  '-Dpact.verifier.publishResults=true'
         }
       }
     }
@@ -18,7 +23,7 @@ pipeline {
         sh 'curl -LO https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.88.3/pact-1.88.3-linux-x86_64.tar.gz'
         sh 'tar xzf pact-1.88.3-linux-x86_64.tar.gz'
         dir('pact/bin') {
-          sh "./pact-broker can-i-deploy -a user-service -b http://pact_broker -e ${GIT_COMMIT}"
+          sh "./pact-broker can-i-deploy -a user-service -b http://cicd.bayhan.ca:9292 -e ${GIT_COMMIT}"
         }
       }
     }
@@ -31,5 +36,4 @@ pipeline {
       }
     }
   }
-
-}
+}

jenkins/without-cd/Jenkinsfile-build

@@ -1,18 +0,0 @@
-#!groovy
-pipeline {
-
-  agent any
-
-  stages {
-    stage('Build') {
-      steps {
-        dir('user-service') {
-          sh "../mvnw clean verify " +
-                  "-Dpact.provider.version=${GIT_COMMIT} " +
-                  "-Dpact.verifier.publishResults=true"
-        }
-      }
-    }
-  }
-
-}

jenkins/without-cd/Jenkinsfile-deploy

@@ -1,38 +0,0 @@
-#!groovy
-pipeline {
-
-  agent any
-
-  parameters {
-    string(name: 'GIT_COMMIT', defaultValue: '', description: 'Version (a.k.a. git commit) to deploy')
-  }
-
-  options {
-    skipDefaultCheckout()
-  }
-
-  stages {
-    stage('Check Pact Verifications') {
-      steps {
-        sh 'curl -LO https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.88.3/pact-1.88.3-linux-x86_64.tar.gz'
-        sh 'tar xzf pact-1.88.3-linux-x86_64.tar.gz'
-        dir('pact/bin') {
-          sh "./pact-broker can-i-deploy -a user-service -b http://pact_broker -e ${GIT_COMMIT} --to prod"
-        }
-      }
-    }
-    stage('Deploy') {
-      steps {
-        echo 'Deploying to prod now...'
-      }
-    }
-    stage('Tag Pact') {
-      steps {
-        dir('pact/bin') {
-          sh "./pact-broker create-version-tag -a user-service -b http://pact_broker -e ${GIT_COMMIT} -t prod"
-        }
-      }
-    }
-  }
-
-}