From 42f347eb4f3bfca6f946f89ab9b431f59ee11770 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Wed, 7 Dec 2022 15:29:55 +0000
Subject: [PATCH 01/20] adding Jenkinsfile for result app

---
 result/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/result/Jenkinsfile b/result/Jenkinsfile
index 6c7b33e2b..20eddf0df 100644
--- a/result/Jenkinsfile
+++ b/result/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
                         }
                         steps{
                                 echo 'Compiling result app'
-                                dir('result'){
+                                dir('worker'){
                                 sh 'npm install'
                                 }
                         }

From 3c150d5b22c93ede3d8772f1c3006404b35bfdd6 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Wed, 7 Dec 2022 15:41:34 +0000
Subject: [PATCH 02/20] adding mock test

---
 result/test/mock.test.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/result/test/mock.test.js b/result/test/mock.test.js
index f99dfdae9..507e9654a 100644
--- a/result/test/mock.test.js
+++ b/result/test/mock.test.js
@@ -27,3 +27,8 @@ describe('mock test 4', () => {
 });
 
 
+describe('mock test 5', () => {
+  it('unit test 5', () => {
+    expect(true).to.be.true;
+  });
+});

From a91230ee06035ce7a289ecd2b154e619bb5724d7 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 08:23:42 +0000
Subject: [PATCH 03/20] add docker based agent 2022-12-10:11:53

---
 worker/Jenkinsfile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 0091427d6..462112a84 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -1,9 +1,11 @@
 pipeline {
-	agent any
-	
-	tools{
-		maven 'maven 3.6.1'
+	agent{
+		docker{
+			image 'maven:3.6.1-jdk-8-slim'
+			args '-v $HOME/.m2:/root/.m2'
+		}
 	}
+	
 	stages{
 		stage("build"){
 			when{
@@ -33,18 +35,18 @@ pipeline {
 				changeset "**/worker/**"
 			}
 			steps{
-				echo 'Packaging worker app'
+				echo 'Packaging worker app 2022-12-10'
 				dir('worker'){
 					sh 'mvn package -DskipTests'
+					archiveArtifacts artifacts: '**/target/*.jar',
+					fingerprint: true
 				}
 			}
 		}
 	}
 	post{
 		always{
-			archiveArtifacts artifacts: '**/target/*.jar',
-			fingerprint: true
-			echo 'Building multibranch pipeline for worker is completed..'
+			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10'
 		}
 	}
 }

From 26b1833585fcc8790294b493e53ea0f5162b334d Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 09:15:44 +0000
Subject: [PATCH 04/20] add docker based agent 2022-12-10:12:45

---
 worker/Jenkinsfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 462112a84..1557fd609 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -38,8 +38,7 @@ pipeline {
 				echo 'Packaging worker app 2022-12-10'
 				dir('worker'){
 					sh 'mvn package -DskipTests'
-					archiveArtifacts artifacts: '**/target/*.jar',
-					fingerprint: true
+					archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
 				}
 			}
 		}

From 55c308b08d6ef481c3149b61c30599811b2ace2f Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 09:24:53 +0000
Subject: [PATCH 05/20] add docker based agent 2022-12-10:12:54

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 1557fd609..6ff270d88 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -45,7 +45,7 @@ pipeline {
 	}
 	post{
 		always{
-			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10'
+			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10 12:54'
 		}
 	}
 }

From ae04ee726d335d17423ae9a940d28e3e9c235619 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 09:41:59 +0000
Subject: [PATCH 06/20] add docker based agent 2022-12-10:13:11

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 6ff270d88..49334911c 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -38,7 +38,7 @@ pipeline {
 				echo 'Packaging worker app 2022-12-10'
 				dir('worker'){
 					sh 'mvn package -DskipTests'
-					archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
+					archiveArtifacts artifacts: 'target/*.jar', fingerprint: true
 				}
 			}
 		}

From bf14904f2f7d46d1b544f40a4263e9a4d6c09c98 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 10:04:44 +0000
Subject: [PATCH 07/20] add docker based agent 2022-12-10:13:34

---
 worker/Jenkinsfile | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 49334911c..a17ec53c0 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -8,9 +8,6 @@ pipeline {
 	
 	stages{
 		stage("build"){
-			when{
-				changeset "**/worker/**"
-			}
 			steps{
 				echo 'Compiling worker app'
 				dir('worker'){
@@ -19,9 +16,6 @@ pipeline {
 			}
 		}
 		stage("test"){
-			when{
-				changeset "**/worker/**"
-			}
 			steps{
 				echo 'Running Unit Tets on worker app'
 				dir('worker'){
@@ -30,22 +24,18 @@ pipeline {
 			}
 		}
 		stage("package"){
-			when{
-				branch 'master'
-				changeset "**/worker/**"
-			}
 			steps{
 				echo 'Packaging worker app 2022-12-10'
 				dir('worker'){
 					sh 'mvn package -DskipTests'
-					archiveArtifacts artifacts: 'target/*.jar', fingerprint: true
+					archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
 				}
 			}
 		}
 	}
 	post{
 		always{
-			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10 12:54'
+			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10 13:34'
 		}
 	}
 }

From 9345ba1f99415736e74718a4814f18dbe33b8bf0 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 10:44:44 +0000
Subject: [PATCH 08/20] add docker based agent 2022-12-10:14:14

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index a17ec53c0..51b196924 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
 			steps{
 				echo 'Packaging worker app 2022-12-10'
 				dir('worker'){
-					sh 'mvn package -DskipTests'
+					sh 'mvn -f worker/pom.xml package -DskipTests'
 					archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
 				}
 			}

From 1f0f88eca9d413ff6c48404939df4749fc1f60e2 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 10:47:02 +0000
Subject: [PATCH 09/20] add docker based agent 2022-12-10:14:16

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 51b196924..465652fd7 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
 			steps{
 				echo 'Packaging worker app 2022-12-10'
 				dir('worker'){
-					sh 'mvn -f worker/pom.xml package -DskipTests'
+					sh 'mvn -f pom.xml package -DskipTests'
 					archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
 				}
 			}

From 2f68f06de3d3710c2b30700356a56292ba2982fa Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 11:15:02 +0000
Subject: [PATCH 10/20] add docker based agent 2022-12-10:14:44

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 465652fd7..a17ec53c0 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -27,7 +27,7 @@ pipeline {
 			steps{
 				echo 'Packaging worker app 2022-12-10'
 				dir('worker'){
-					sh 'mvn -f pom.xml package -DskipTests'
+					sh 'mvn package -DskipTests'
 					archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
 				}
 			}

From 284b93ff724643f2187b87c893c9c6da5446fedb Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 11:56:50 +0000
Subject: [PATCH 11/20] add docker based agent 2022-12-10:15:26

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index a17ec53c0..952c2c3e4 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -35,7 +35,7 @@ pipeline {
 	}
 	post{
 		always{
-			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10 13:34'
+			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10 15:26'
 		}
 	}
 }

From 8281f03ecb5d7247c31d5018d76b01fc536bbac9 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 14:14:23 +0000
Subject: [PATCH 12/20] adding Dockerfile for worker 2022-12-10-17:45

---
 worker/Dockerfile | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 worker/Dockerfile

diff --git a/worker/Dockerfile b/worker/Dockerfile
new file mode 100644
index 000000000..d5039fd7a
--- /dev/null
+++ b/worker/Dockerfile
@@ -0,0 +1,6 @@
+FROM maven:3.6.1-jdk-8-slim
+WORKDIR /app
+COPY . .
+RUN mvn package && \
+mv target/worker-jar-with-dependencies.jar /run/worker.jar && rm -rf /app/*
+CMD java -jar /run/worker.jar

From fa3203bc296471636d16abc9522f30c86a974f4f Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 14:36:22 +0000
Subject: [PATCH 13/20] updating Jenkinsfile for worker 2022-12-10-18:06

---
 worker/Jenkinsfile          | 15 ++++++++++-
 worker/Jenkinsfile-version1 | 50 +++++++++++++++++++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 worker/Jenkinsfile-version1

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 952c2c3e4..955c9d412 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -32,10 +32,23 @@ pipeline {
 				}
 			}
 		}
+		stage('docker-package'){
+			agent any
+			steps{
+				echo 'Packaging worker app with docker'
+				script{
+					docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') {
+						def workerImage = docker.build("aminsh86/worker:v${env.BUILD_ID}", "./worker")
+						workerImage.push()
+						workerImage.push("latest")
+					}
+				}
+			}
+		}
 	}
 	post{
 		always{
-			echo 'Building multibranch pipeline for worker is completed.. 2022-12-10 15:26'
+			echo 'Job is completed.. 2022-12-10 17:58'
 		}
 	}
 }
diff --git a/worker/Jenkinsfile-version1 b/worker/Jenkinsfile-version1
new file mode 100644
index 000000000..0091427d6
--- /dev/null
+++ b/worker/Jenkinsfile-version1
@@ -0,0 +1,50 @@
+pipeline {
+	agent any
+	
+	tools{
+		maven 'maven 3.6.1'
+	}
+	stages{
+		stage("build"){
+			when{
+				changeset "**/worker/**"
+			}
+			steps{
+				echo 'Compiling worker app'
+				dir('worker'){
+				sh 'mvn compile'
+				}
+			}
+		}
+		stage("test"){
+			when{
+				changeset "**/worker/**"
+			}
+			steps{
+				echo 'Running Unit Tets on worker app'
+				dir('worker'){
+					sh 'mvn clean test'
+				}
+			}
+		}
+		stage("package"){
+			when{
+				branch 'master'
+				changeset "**/worker/**"
+			}
+			steps{
+				echo 'Packaging worker app'
+				dir('worker'){
+					sh 'mvn package -DskipTests'
+				}
+			}
+		}
+	}
+	post{
+		always{
+			archiveArtifacts artifacts: '**/target/*.jar',
+			fingerprint: true
+			echo 'Building multibranch pipeline for worker is completed..'
+		}
+	}
+}

From 71b47aba74c44121fb21e0f152f5490da7c13523 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 14:43:07 +0000
Subject: [PATCH 14/20] updating Jenkinsfile for condition for worker
 2022-12-10-18:12

---
 worker/Jenkinsfile | 139 ++++++++++++++++++++++++++++-----------------
 1 file changed, 87 insertions(+), 52 deletions(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 955c9d412..c2bf9293a 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -1,54 +1,89 @@
 pipeline {
-	agent{
-		docker{
-			image 'maven:3.6.1-jdk-8-slim'
-			args '-v $HOME/.m2:/root/.m2'
-		}
-	}
-	
-	stages{
-		stage("build"){
-			steps{
-				echo 'Compiling worker app'
-				dir('worker'){
-				sh 'mvn compile'
-				}
-			}
-		}
-		stage("test"){
-			steps{
-				echo 'Running Unit Tets on worker app'
-				dir('worker'){
-					sh 'mvn clean test'
-				}
-			}
-		}
-		stage("package"){
-			steps{
-				echo 'Packaging worker app 2022-12-10'
-				dir('worker'){
-					sh 'mvn package -DskipTests'
-					archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
-				}
-			}
-		}
-		stage('docker-package'){
-			agent any
-			steps{
-				echo 'Packaging worker app with docker'
-				script{
-					docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') {
-						def workerImage = docker.build("aminsh86/worker:v${env.BUILD_ID}", "./worker")
-						workerImage.push()
-						workerImage.push("latest")
-					}
-				}
-			}
-		}
-	}
-	post{
-		always{
-			echo 'Job is completed.. 2022-12-10 17:58'
-		}
-	}
+
+  agent none
+
+  stages{
+      stage("build"){
+        when{
+            changeset "**/worker/**"
+          }
+
+        agent{
+          docker{
+            image 'maven:3.6.1-jdk-8-slim'
+            args '-v $HOME/.m2:/root/.m2'
+          }
+        }
+
+        steps{
+          echo 'Compiling worker app..'
+          dir('worker'){
+            sh 'mvn compile'
+          }
+        }
+      }
+      stage("test"){
+        when{
+          changeset "**/worker/**"
+        }
+        agent{
+          docker{
+            image 'maven:3.6.1-jdk-8-slim'
+            args '-v $HOME/.m2:/root/.m2'
+          }
+        }
+        steps{
+          echo 'Running Unit Tets on worker app..'
+          dir('worker'){
+            sh 'mvn clean test'
+           }
+
+          }
+      }
+      stage("package"){
+        when{
+          branch 'master'
+          changeset "**/worker/**"
+        }
+        agent{
+          docker{
+            image 'maven:3.6.1-jdk-8-slim'
+            args '-v $HOME/.m2:/root/.m2'
+          }
+        }
+        steps{
+          echo 'Packaging worker app'
+          dir('worker'){
+            sh 'mvn package -DskipTests'
+            archiveArtifacts artifacts: '**/target/*.jar', fingerprint: true
+          }
+
+        }
+      }
+
+      stage('docker-package'){
+          agent any
+          when{
+            changeset "**/worker/**"
+            branch 'master'
+          }
+          steps{
+            echo 'Packaging worker app with docker'
+            script{
+              docker.withRegistry('https://index.docker.io/v1/', 'dockerlogin') {
+                  def workerImage = docker.build("aminsh86/worker:v${env.BUILD_ID}", "./worker")
+                  workerImage.push()
+                  workerImage.push("${env.BRANCH_NAME}")
+                  workerImage.push("latest")
+              }
+            }
+          }
+      }
+  }
+
+  post{
+    always{
+        echo 'Building multibranch pipeline for worker is completed..'
+    }
+  }
 }

From 9c77263ef15ebd5fec6b37eddd1caa3c4ad06431 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 15:03:47 +0000
Subject: [PATCH 15/20] test docker login

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index cb8070089..e1cf7fb24 100644
--- a/README.md
+++ b/README.md
@@ -66,3 +66,4 @@ subject=Unittest
 ### 2022-12-05 ### 17:50
 ### 2022-12-07 ### 15:44
 ### 2022-12-07 ### 18:21
+### 2022-12-10 ### 18:33

From 8ad30131e67394afe345bc3285bb12bab2c9bcf5 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 15:27:07 +0000
Subject: [PATCH 16/20] per stage agents, conditional execution 18:57

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index c2bf9293a..0ec8844e5 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -83,7 +83,7 @@ pipeline {
 
   post{
     always{
-        echo 'Building multibranch pipeline for worker is completed..'
+        echo 'Building multibranch pipeline for worker is completed..2022-12-10-18:58'
     }
   }
 }

From 9af3c4aa4f7b4bd87c4369bd4dc2305c0e6ecfef Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 15:29:38 +0000
Subject: [PATCH 17/20] per stage agents, conditional execution 18:59

---
 worker/Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 0ec8844e5..f6ed96a43 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -83,7 +83,7 @@ pipeline {
 
   post{
     always{
-        echo 'Building multibranch pipeline for worker is completed..2022-12-10-18:58'
+        echo 'Building multibranch pipeline for worker is completed..2022-12-10-18:59'
     }
   }
 }

From 9a0baa5f5766a5264247a1ce1826856cd6508d81 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 15:36:34 +0000
Subject: [PATCH 18/20] per stage agents, conditional execution 19:06

---
 worker/Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index f6ed96a43..495592349 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -42,7 +42,7 @@ pipeline {
       }
       stage("package"){
         when{
-          branch 'master'
+          branch 'feature/dockerfiles'
           changeset "**/worker/**"
         }
         agent{
@@ -65,7 +65,7 @@ pipeline {
           agent any
           when{
             changeset "**/worker/**"
-            branch 'master'
+            branch 'feature/dockerfiles'
           }
           steps{
             echo 'Packaging worker app with docker'

From f478f55005f05418525df85723f38493dad0cd44 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 15:40:56 +0000
Subject: [PATCH 19/20] per stage agents, conditional execution 19:10

---
 worker/amin | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 worker/amin

diff --git a/worker/amin b/worker/amin
new file mode 100644
index 000000000..e69de29bb

From af0f68f776b3253ae433a9f6458644de9adf2e82 Mon Sep 17 00:00:00 2001
From: aminsh86 <info@aminshateri.com>
Date: Sat, 10 Dec 2022 15:44:30 +0000
Subject: [PATCH 20/20] per stage agents, conditional execution 19:14

---
 worker/Jenkinsfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/worker/Jenkinsfile b/worker/Jenkinsfile
index 495592349..3b6d518eb 100644
--- a/worker/Jenkinsfile
+++ b/worker/Jenkinsfile
@@ -63,10 +63,6 @@ pipeline {
 
       stage('docker-package'){
           agent any
-          when{
-            changeset "**/worker/**"
-            branch 'feature/dockerfiles'
-          }
           steps{
             echo 'Packaging worker app with docker'
             script{