Modify Jenkins file to build image every time

Signed-off-by: Mihailo <mmarcetic@griddynamcis.com>

Jenkinsfile

@@ -4,7 +4,9 @@ pipeline {
     environment {
         // Define environment variables
         DOCKER_REGISTRY = "docker.io"
-        DOCKER_IMAGE = "mmarcetic/main"
+        DOCKER_IMAGE_MAIN = 'mmarcetic/main'
+        DOCKER_IMAGE_MR = 'mmarcetic/mr'
+        GIT_COMMIT = sh(script: "git rev-parse --short HEAD", returnStdout: true).trim()
     }
     
     stages {
@@ -15,23 +17,88 @@ pipeline {
             }
         }
 
-        stage('Build Docker Image') {
+        stage('Set Docker Image') {
             steps {
                 script {
-                    // Build the Docker image
-                    def gitCommit = sh(script: "git rev-parse --short HEAD", returnStdout: true).trim()
-                    sh "docker build -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${gitCommit} ."
+                    // Set Docker image based on the branch name
+                    if (env.BRANCH_NAME == 'main') {
+                        env.DOCKER_IMAGE = DOCKER_IMAGE_MAIN
+                    } else {
+                        env.DOCKER_IMAGE = DOCKER_IMAGE_MR
+                    }
+
+                    echo "Using Docker image: ${env.DOCKER_IMAGE}"
                 }
             }
         }
 
-        stage('Push Docker Image') {
+        stage('Checkstyle Report') {
+            when {
+                    changeRequest()
+                }
+            steps {
+                script {
+                    // Checkstyle with Gradle
+                    sh './gradlew checkstyleMain'
+                    archiveArtifacts artifacts: 'build/reports/checkstyle/*.xml', allowEmptyArchive: true
+                }
+            }
+        }
+
+        stage('Test') {
+            when {
+                changeRequest()
+            }
+            steps {
+                // Test using Gradle
+                sh './gradlew clean test'
+            }
+        }
+
+        stage('Build Without Tests') {
+            when {
+                changeRequest()
+            }
+            steps {
+                script {
+                    // Build without tests using Gradle
+                    sh './gradlew build -x test'
+                }
+            }
+        }
+
+        stage('Build Docker Image') {
+            steps {
+                script {
+                    // Build the Docker image
+                    sh "docker build -t ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${GIT_COMMIT} ."
+                }
+            }
+        }
+
+        stage('Push Docker Image for Change Request') {
+            when {
+                    changeRequest()
+            }
             steps {
                 script {
-                    def gitCommit = sh(script: "git rev-parse --short HEAD", returnStdout: true).trim()
                     withCredentials([usernamePassword(credentialsId: "docker-login", usernameVariable: "DOCKER_USER", passwordVariable: "DOCKER_PASSWORD")]) {
                         sh "docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}"
-                        sh "docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${gitCommit}"
+                        sh "docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${GIT_COMMIT}"
+                    }
+                }
+            }
+        }
+
+        stage('Push Docker Image for Main') {
+            when {
+                    branch "main"
+            }
+            steps {
+                script {
+                    withCredentials([usernamePassword(credentialsId: "docker-login", usernameVariable: "DOCKER_USER", passwordVariable: "DOCKER_PASSWORD")]) {
+                        sh "docker login -u ${DOCKER_USER} -p ${DOCKER_PASSWORD}"
+                        sh "docker push ${DOCKER_REGISTRY}/${DOCKER_IMAGE}:${GIT_COMMIT}"
                     }
                 }
             }

config.yaml

@@ -0,0 +1,11 @@
+kind: Cluster
+apiVersion: kind.x-k8s.io/v1alpha4
+nodes:
+- role: control-plane
+  extraPortMappings:
+  - containerPort: 30950
+    hostPort: 30950
+    listenAddress: "127.0.0.1"
+    protocol: TCP
+
+

deployment.yaml

@@ -0,0 +1,22 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: spring-boot-app
+  namespace: petclinic
+spec:
+  replicas: 2
+  selector:
+    matchLabels:
+      app: spring-boot-app
+  template:
+    metadata:
+      labels:
+        app: spring-boot-app
+    spec:
+      containers:
+      - name: spring-boot-app
+        image: docker.io/mmarcetic/main:2.0       
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 8080
+

service.yaml

@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: spring-boot-app-service
+  namespace: petclinic
+spec:
+  selector:
+    app: spring-boot-app
+  ports:
+    - protocol: TCP
+      port: 80
+      targetPort: 8080
+      nodePort: 30950
+  type: NodePort
+