From 6be7a2b1a99b63ff41c270c10a2b232120f1e2a4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 9 Mar 2019 13:03:58 +0530 Subject: [PATCH 001/269] Create laskd --- laskd | 1 + 1 file changed, 1 insertion(+) create mode 100644 laskd diff --git a/laskd b/laskd new file mode 100644 index 00000000..073da044 --- /dev/null +++ b/laskd @@ -0,0 +1 @@ +kdsjfsk From 757de1dbccb3a230ad1dad4c6447ebef63f4eec7 Mon Sep 17 00:00:00 2001 From: naresh Date: Sat, 9 Mar 2019 07:34:27 +0000 Subject: [PATCH 002/269] new --- ddd | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 ddd diff --git a/ddd b/ddd new file mode 100644 index 00000000..e69de29b From e1de06c7b5d121aa5691ed76508a722a6b6a4ad5 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 9 Mar 2019 16:40:41 +0530 Subject: [PATCH 003/269] Delete ddd --- ddd | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ddd diff --git a/ddd b/ddd deleted file mode 100644 index e69de29b..00000000 From 678fa725f85633a53f1c60330a2a746261150aef Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 9 Mar 2019 16:45:29 +0530 Subject: [PATCH 004/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c960df01..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V1.0 +Sample Java Applicaiton V2.0 From 3e74c83e56d2916c45f4639223fef1de6607fe53 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 6 Apr 2019 16:43:29 +0530 Subject: [PATCH 005/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..8cef9f1c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V3.0 From 03c15b23621d930c37ba735622c73e9115aeec8c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 6 Apr 2019 16:51:16 +0530 Subject: [PATCH 006/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cef9f1c..c960df01 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.0 +Sample Java Applicaiton V1.0 From 0cf0ca0636783cb814be6baee3fd02064afd3db4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 18 Apr 2019 16:56:39 +0530 Subject: [PATCH 007/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c960df01..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V1.0 +Sample Java Applicaiton V2.0 From 1de2e33d1e9f565fe02ea47593759b1777eab015 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 19 Apr 2019 12:26:40 +0530 Subject: [PATCH 008/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..a4a682d8 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.5 From b946c69ba39ea0ceab6598c00bb3e3e06624e82f Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 19 Apr 2019 12:28:51 +0530 Subject: [PATCH 009/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a4a682d8..abd7e84b 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.5 +Sample Java Applicaiton V2.6 From 7a741bd671d4c859f76a4421616ff303ba2d3a4e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 19 Apr 2019 12:44:51 +0530 Subject: [PATCH 010/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index abd7e84b..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.6 +Sample Java Applicaiton V2.0 From eace93aa544608e9cac4a3c099d48a7b6c450e15 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 18 May 2019 10:07:28 +0530 Subject: [PATCH 011/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..c4f8694c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.1 From 641ca0b54516898b6ae056d3fc72a228584f5b82 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 18 May 2019 10:52:22 +0530 Subject: [PATCH 012/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4f8694c..6a584147 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.1 +Sample Java Applicaiton V2.2 From 8f050799b8132eea8eda411255ebff9e63747b2d Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 18 May 2019 10:58:02 +0530 Subject: [PATCH 013/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a584147..fb9520d8 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.2 +Sample Java Applicaiton V2.3 From c5952b04936295329667717261c7545e8cad79f3 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 1 Jun 2019 10:46:00 +0530 Subject: [PATCH 014/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb9520d8..c960df01 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.3 +Sample Java Applicaiton V1.0 From 52fa12bdd29980a0dff706c47eac9321617894f9 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 1 Jun 2019 11:34:48 +0530 Subject: [PATCH 015/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c960df01..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V1.0 +Sample Java Applicaiton V2.0 From c752ce61d245417ffa75a02cea77898db3b89b48 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 29 Jun 2019 11:01:17 +0530 Subject: [PATCH 016/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..8cef9f1c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V3.0 From c471d12cd2a88b3aab81025b8e1c98521ab14635 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 29 Jun 2019 12:07:22 +0530 Subject: [PATCH 017/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cef9f1c..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.0 +Sample Java Applicaiton V2.0 From 725ba6c82a1e121b38518728b8789bd9920af0af Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 27 Jul 2019 12:29:27 +0530 Subject: [PATCH 018/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..c4f8694c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.1 From c285814b7140e34b34e5bf0268af28021064aac2 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 24 Aug 2019 11:59:01 +0530 Subject: [PATCH 019/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4f8694c..6a584147 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.1 +Sample Java Applicaiton V2.2 From 4ccf997d2294e67a0eb7f640033f953893a659b1 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 24 Aug 2019 12:04:09 +0530 Subject: [PATCH 020/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a584147..fb9520d8 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.2 +Sample Java Applicaiton V2.3 From 977825b3df3a1fefb00b9f74ab5dcc3e75b392bc Mon Sep 17 00:00:00 2001 From: lerndevops Date: Fri, 30 Aug 2019 02:22:48 -0700 Subject: [PATCH 021/269] Dockerfile & Jenkinsfile --- Dockerfile | 4 ++++ Jenkinsfile | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ Jenkinsfile-win | 51 +++++++++++++++++++++++++++++++++++++++++++++++++ laskd | 1 - 4 files changed, 106 insertions(+), 1 deletion(-) create mode 100644 Dockerfile create mode 100644 Jenkinsfile create mode 100644 Jenkinsfile-win delete mode 100644 laskd diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..42b027a1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM tomcat +ADD addressbook.war /usr/local/tomcat/webapps +EXPOSE 8080 +CMD /usr/local/tomcat/bin/catalina.sh run diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..f680088f --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,51 @@ +pipeline { + agent any + stages { + stage('compile') { + steps { + echo 'compiling..' + git url: 'https://github.com/lerndevops/DevOpsClassCodes' + sh label: '', script: 'mvn compile' + } + } + stage('codereview-pmd') { + steps { + echo 'codereview..' + sh label: '', script: 'mvn -P metrics pmd:pmd' + } + post { + success { + pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/pmd.xml', unHealthy: '' + } + } + } + stage('unit-test') { + steps { + echo 'codereview..' + sh label: '', script: 'mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('metric-check') { + steps { + echo 'unit test..' + sh label: '', script: 'mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + post { + success { + cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + } + } + } + stage('package') { + steps { + echo 'metric-check..' + sh label: '', script: 'mvn package' + } + } + } +} diff --git a/Jenkinsfile-win b/Jenkinsfile-win new file mode 100644 index 00000000..4d730378 --- /dev/null +++ b/Jenkinsfile-win @@ -0,0 +1,51 @@ +pipeline { + agent any + stages { + stage('compile') { + steps { + echo 'compiling..' + git url: 'https://github.com/lerndevops/DevOpsClassCodes' + bat label: '', script: 'mvn compile' + } + } + stage('codereview-pmd') { + steps { + echo 'codereview..' + bat label: '', script: 'mvn -P metrics pmd:pmd' + } + post { + success { + pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/pmd.xml', unHealthy: '' + } + } + } + stage('unit-test') { + steps { + echo 'codereview..' + bat label: '', script: 'mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('metric-check') { + steps { + echo 'unit test..' + bat label: '', script: 'mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + post { + success { + cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + } + } + } + stage('package') { + steps { + echo 'metric-check..' + bat label: '', script: 'mvn package' + } + } + } +} diff --git a/laskd b/laskd deleted file mode 100644 index 073da044..00000000 --- a/laskd +++ /dev/null @@ -1 +0,0 @@ -kdsjfsk From d976cbc5b0f9c5513bd13c17325148c10832684c Mon Sep 17 00:00:00 2001 From: lerndevops Date: Fri, 30 Aug 2019 02:30:00 -0700 Subject: [PATCH 022/269] modified jenkinsfile --- Jenkinsfile | 2 +- Jenkinsfile-win | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f680088f..d092901e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('compile') { steps { echo 'compiling..' - git url: 'https://github.com/lerndevops/DevOpsClassCodes' + git url: 'https://github.com/lerndevops/samplejavaapp' sh label: '', script: 'mvn compile' } } diff --git a/Jenkinsfile-win b/Jenkinsfile-win index 4d730378..bb732772 100644 --- a/Jenkinsfile-win +++ b/Jenkinsfile-win @@ -4,7 +4,7 @@ pipeline { stage('compile') { steps { echo 'compiling..' - git url: 'https://github.com/lerndevops/DevOpsClassCodes' + git url: 'https://github.com/lerndevops/samplejavaapp' bat label: '', script: 'mvn compile' } } From bf2c0d63ac3e81c16e4de85ac3fcd0fce2500388 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 31 Aug 2019 11:09:37 +0530 Subject: [PATCH 023/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb9520d8..28cc7f54 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.3 +Sample Java Applicaiton V2.4 From 6fb31a072d0aa6f57998aff5b9b300a11686679b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 31 Aug 2019 12:01:52 +0530 Subject: [PATCH 024/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28cc7f54..bfb57404 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.4 +5Sample Java Applicaiton V2.4 From 1e381b0e6b77d77a560343c6e53e94494a7f1244 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 28 Sep 2019 10:12:30 +0530 Subject: [PATCH 025/269] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 42b027a1..773a3371 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM tomcat -ADD addressbook.war /usr/local/tomcat/webapps +ADD target/addressbook.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run From d6237356624029e3670a1ff1824c8f1342ef57bf Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 28 Sep 2019 10:14:44 +0530 Subject: [PATCH 026/269] Update Jenkinsfile --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d092901e..e4d2f525 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,14 +4,14 @@ pipeline { stage('compile') { steps { echo 'compiling..' - git url: 'https://github.com/lerndevops/samplejavaapp' - sh label: '', script: 'mvn compile' + git url: 'https://github.com/lerndevops/DevOpsClassCodes' + sh script: 'mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh label: '', script: 'mvn -P metrics pmd:pmd' + sh script: 'mvn -P metrics pmd:pmd' } post { success { @@ -22,7 +22,7 @@ pipeline { stage('unit-test') { steps { echo 'codereview..' - sh label: '', script: 'mvn test' + sh script: 'mvn test' } post { success { @@ -33,7 +33,7 @@ pipeline { stage('metric-check') { steps { echo 'unit test..' - sh label: '', script: 'mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: 'mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -44,7 +44,7 @@ pipeline { stage('package') { steps { echo 'metric-check..' - sh label: '', script: 'mvn package' + sh script: 'mvn package' } } } From 86f7fe66e4d6fa79e6040a9a1f7b5816f23bda90 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 28 Sep 2019 10:15:34 +0530 Subject: [PATCH 027/269] Rename Jenkinsfile to Jenkinsfile-linux --- Jenkinsfile => Jenkinsfile-linux | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Jenkinsfile => Jenkinsfile-linux (100%) diff --git a/Jenkinsfile b/Jenkinsfile-linux similarity index 100% rename from Jenkinsfile rename to Jenkinsfile-linux From ee2bbd16587c5b9f8d4d49590db5d791bd375ee8 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 28 Sep 2019 10:16:24 +0530 Subject: [PATCH 028/269] Create Jenkinsfilek8s --- Jenkinsfilek8s | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 Jenkinsfilek8s diff --git a/Jenkinsfilek8s b/Jenkinsfilek8s new file mode 100644 index 00000000..c2fc513f --- /dev/null +++ b/Jenkinsfilek8s @@ -0,0 +1,33 @@ +pipeline { + agent any + stages { + stage('checkout repo') { + steps { + git url: 'https://github.com/lerndevops/DevOpsClassCodes.git ' + } + } + stage('build artifact') { + steps { + sh 'mvn clean package' + } + } + stage('build docker image') { + steps { + sh 'docker build -t lerndevops/addressbook .' + } + } + stage('push docker image') { + steps { + withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { + sh "docker login -u lerndevops -p ${DOCKER_HUB_PWD}" + } + sh 'docker push lerndevops/addressbook' + } + } + stage('Deploy to K8s') { + steps { + sh 'kubectl apply -f addressbook-deploy-k8s.yml' + } + } + } +} From 287f95357c6856be5ae81387497a6c8ff08bef22 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 28 Sep 2019 11:09:55 +0530 Subject: [PATCH 029/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bfb57404..f7ede5fd 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -5Sample Java Applicaiton V2.4 +5Sample Java Applicaiton V2.5 From cf8b23549111fe9442ee4b4b77d832c795f3642a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 28 Sep 2019 11:42:38 +0530 Subject: [PATCH 030/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7ede5fd..46e248ab 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -5Sample Java Applicaiton V2.5 +5Sample Java Applicaiton V2.6 From 51cb644e6ede7e9b363195cbca4a6f764c812b7a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 28 Sep 2019 11:47:43 +0530 Subject: [PATCH 031/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 46e248ab..f7ede5fd 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -5Sample Java Applicaiton V2.6 +5Sample Java Applicaiton V2.5 From 6fec7ad96ef74c61faac925a0ef67f57dbc56a6e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 12 Oct 2019 08:06:56 +0530 Subject: [PATCH 032/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7ede5fd..a4a682d8 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -5Sample Java Applicaiton V2.5 +Sample Java Applicaiton V2.5 From 3713f6e65204a875b2dd82b60e2b506326f53a76 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 12 Oct 2019 08:11:37 +0530 Subject: [PATCH 033/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a4a682d8..abd7e84b 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.5 +Sample Java Applicaiton V2.6 From 38d5dd269a4d64d6ee87cf689e0731162331eb01 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 12 Oct 2019 12:15:49 +0530 Subject: [PATCH 034/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index abd7e84b..ab82509b 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.6 +Sample Java Applicaiton V2.7 From 0f86b5214bcc9d47a986a2ed085fa7e7a54deb62 Mon Sep 17 00:00:00 2001 From: lerndevops Date: Mon, 14 Oct 2019 22:23:15 -0700 Subject: [PATCH 035/269] deploy scripts --- Dockerfile | 2 +- deploy/ansible.cfg | 490 +++++++++++++++++++++++++ deploy/deploy.yml | 12 + deploy/inv | 18 + deploy/sampleapp-deploy-k8s.yml | 36 ++ Jenkinsfilek8s => jenkinsfile-k8s | 0 Jenkinsfile-linux => jenkinsfile-linux | 0 Jenkinsfile-win => jenkinsfile-win | 0 8 files changed, 557 insertions(+), 1 deletion(-) create mode 100755 deploy/ansible.cfg create mode 100755 deploy/deploy.yml create mode 100755 deploy/inv create mode 100755 deploy/sampleapp-deploy-k8s.yml rename Jenkinsfilek8s => jenkinsfile-k8s (100%) rename Jenkinsfile-linux => jenkinsfile-linux (100%) rename Jenkinsfile-win => jenkinsfile-win (100%) diff --git a/Dockerfile b/Dockerfile index 773a3371..eeaba822 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM tomcat -ADD target/addressbook.war /usr/local/tomcat/webapps +ADD target/sampleapp.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run diff --git a/deploy/ansible.cfg b/deploy/ansible.cfg new file mode 100755 index 00000000..929a3dcc --- /dev/null +++ b/deploy/ansible.cfg @@ -0,0 +1,490 @@ +# config file for ansible -- https://ansible.com/ +# =============================================== + +# nearly all parameters can be overridden in ansible-playbook +# or with command line flags. ansible will read ANSIBLE_CONFIG, +# ansible.cfg in the current working directory, .ansible.cfg in +# the home directory or /etc/ansible/ansible.cfg, whichever it +# finds first + +[defaults] + +# some basic default values... + +#inventory = /etc/ansible/hosts +#library = /usr/share/my_modules/ +#module_utils = /usr/share/my_module_utils/ +#remote_tmp = ~/.ansible/tmp +#local_tmp = ~/.ansible/tmp +#plugin_filters_cfg = /etc/ansible/plugin_filters.yml +#forks = 5 +#poll_interval = 15 +#sudo_user = root +#ask_sudo_pass = True +#ask_pass = True +#transport = smart +#remote_port = 22 +#module_lang = C +#module_set_locale = False + +# plays will gather facts by default, which contain information about +# the remote system. +# +# smart - gather by default, but don't regather if already gathered +# implicit - gather by default, turn off with gather_facts: False +# explicit - do not gather by default, must say gather_facts: True +#gathering = implicit + +# This only affects the gathering done by a play's gather_facts directive, +# by default gathering retrieves all facts subsets +# all - gather all subsets +# network - gather min and network facts +# hardware - gather hardware facts (longest facts to retrieve) +# virtual - gather min and virtual facts +# facter - import facts from facter +# ohai - import facts from ohai +# You can combine them using comma (ex: network,virtual) +# You can negate them using ! (ex: !hardware,!facter,!ohai) +# A minimal set of facts is always gathered. +#gather_subset = all + +# some hardware related facts are collected +# with a maximum timeout of 10 seconds. This +# option lets you increase or decrease that +# timeout to something more suitable for the +# environment. +# gather_timeout = 10 + +# Ansible facts are available inside the ansible_facts.* dictionary +# namespace. This setting maintains the behaviour which was the default prior +# to 2.5, duplicating these variables into the main namespace, each with a +# prefix of 'ansible_'. +# This variable is set to True by default for backwards compatibility. It +# will be changed to a default of 'False' in a future release. +# ansible_facts. +# inject_facts_as_vars = True + +# additional paths to search for roles in, colon separated +#roles_path = /etc/ansible/roles + +# uncomment this to disable SSH key host checking +host_key_checking = False + +# change the default callback, you can only have one 'stdout' type enabled at a time. +#stdout_callback = skippy + + +## Ansible ships with some plugins that require whitelisting, +## this is done to avoid running all of a type by default. +## These setting lists those that you want enabled for your system. +## Custom plugins should not need this unless plugin author specifies it. + +# enable callback plugins, they can output to stdout but cannot be 'stdout' type. +#callback_whitelist = timer, mail + +# Determine whether includes in tasks and handlers are "static" by +# default. As of 2.0, includes are dynamic by default. Setting these +# values to True will make includes behave more like they did in the +# 1.x versions. +#task_includes_static = False +#handler_includes_static = False + +# Controls if a missing handler for a notification event is an error or a warning +#error_on_missing_handler = True + +# change this for alternative sudo implementations +#sudo_exe = sudo + +# What flags to pass to sudo +# WARNING: leaving out the defaults might create unexpected behaviours +#sudo_flags = -H -S -n + +# SSH timeout +#timeout = 10 + +# default user to use for playbooks if user is not specified +# (/usr/bin/ansible will use current user as default) +#remote_user = root + +# logging is off by default unless this path is defined +# if so defined, consider logrotate +#log_path = /var/log/ansible.log + +# default module name for /usr/bin/ansible +#module_name = command + +# use this shell for commands executed under sudo +# you may need to change this to bin/bash in rare instances +# if sudo is constrained +#executable = /bin/sh + +# if inventory variables overlap, does the higher precedence one win +# or are hash values merged together? The default is 'replace' but +# this can also be set to 'merge'. +#hash_behaviour = replace + +# by default, variables from roles will be visible in the global variable +# scope. To prevent this, the following option can be enabled, and only +# tasks and handlers within the role will see the variables there +#private_role_vars = yes + +# list any Jinja2 extensions to enable here: +#jinja2_extensions = jinja2.ext.do,jinja2.ext.i18n + +# if set, always use this private key file for authentication, same as +# if passing --private-key to ansible or ansible-playbook +#private_key_file = /path/to/file + +# If set, configures the path to the Vault password file as an alternative to +# specifying --vault-password-file on the command line. +#vault_password_file = /path/to/vault_password_file + +# format of string {{ ansible_managed }} available within Jinja2 +# templates indicates to users editing templates files will be replaced. +# replacing {file}, {host} and {uid} and strftime codes with proper values. +#ansible_managed = Ansible managed: {file} modified on %Y-%m-%d %H:%M:%S by {uid} on {host} +# {file}, {host}, {uid}, and the timestamp can all interfere with idempotence +# in some situations so the default is a static string: +#ansible_managed = Ansible managed + +# by default, ansible-playbook will display "Skipping [host]" if it determines a task +# should not be run on a host. Set this to "False" if you don't want to see these "Skipping" +# messages. NOTE: the task header will still be shown regardless of whether or not the +# task is skipped. +#display_skipped_hosts = True + +# by default, if a task in a playbook does not include a name: field then +# ansible-playbook will construct a header that includes the task's action but +# not the task's args. This is a security feature because ansible cannot know +# if the *module* considers an argument to be no_log at the time that the +# header is printed. If your environment doesn't have a problem securing +# stdout from ansible-playbook (or you have manually specified no_log in your +# playbook on all of the tasks where you have secret information) then you can +# safely set this to True to get more informative messages. +#display_args_to_stdout = False + +# by default (as of 1.3), Ansible will raise errors when attempting to dereference +# Jinja2 variables that are not set in templates or action lines. Uncomment this line +# to revert the behavior to pre-1.3. +#error_on_undefined_vars = False + +# by default (as of 1.6), Ansible may display warnings based on the configuration of the +# system running ansible itself. This may include warnings about 3rd party packages or +# other conditions that should be resolved if possible. +# to disable these warnings, set the following value to False: +#system_warnings = True + +# by default (as of 1.4), Ansible may display deprecation warnings for language +# features that should no longer be used and will be removed in future versions. +# to disable these warnings, set the following value to False: +deprecation_warnings = False + +# (as of 1.8), Ansible can optionally warn when usage of the shell and +# command module appear to be simplified by using a default Ansible module +# instead. These warnings can be silenced by adjusting the following +# setting or adding warn=yes or warn=no to the end of the command line +# parameter string. This will for example suggest using the git module +# instead of shelling out to the git command. +# command_warnings = False + + +# set plugin path directories here, separate with colons +#action_plugins = /usr/share/ansible/plugins/action +#become_plugins = /usr/share/ansible/plugins/become +#cache_plugins = /usr/share/ansible/plugins/cache +#callback_plugins = /usr/share/ansible/plugins/callback +#connection_plugins = /usr/share/ansible/plugins/connection +#lookup_plugins = /usr/share/ansible/plugins/lookup +#inventory_plugins = /usr/share/ansible/plugins/inventory +#vars_plugins = /usr/share/ansible/plugins/vars +#filter_plugins = /usr/share/ansible/plugins/filter +#test_plugins = /usr/share/ansible/plugins/test +#terminal_plugins = /usr/share/ansible/plugins/terminal +#strategy_plugins = /usr/share/ansible/plugins/strategy + + +# by default, ansible will use the 'linear' strategy but you may want to try +# another one +#strategy = free + +# by default callbacks are not loaded for /bin/ansible, enable this if you +# want, for example, a notification or logging callback to also apply to +# /bin/ansible runs +#bin_ansible_callbacks = False + + +# don't like cows? that's unfortunate. +# set to 1 if you don't want cowsay support or export ANSIBLE_NOCOWS=1 +#nocows = 1 + +# set which cowsay stencil you'd like to use by default. When set to 'random', +# a random stencil will be selected for each task. The selection will be filtered +# against the `cow_whitelist` option below. +#cow_selection = default +#cow_selection = random + +# when using the 'random' option for cowsay, stencils will be restricted to this list. +# it should be formatted as a comma-separated list with no spaces between names. +# NOTE: line continuations here are for formatting purposes only, as the INI parser +# in python does not support them. +#cow_whitelist=bud-frogs,bunny,cheese,daemon,default,dragon,elephant-in-snake,elephant,eyes,\ +# hellokitty,kitty,luke-koala,meow,milk,moofasa,moose,ren,sheep,small,stegosaurus,\ +# stimpy,supermilker,three-eyes,turkey,turtle,tux,udder,vader-koala,vader,www + +# don't like colors either? +# set to 1 if you don't want colors, or export ANSIBLE_NOCOLOR=1 +#nocolor = 1 + +# if set to a persistent type (not 'memory', for example 'redis') fact values +# from previous runs in Ansible will be stored. This may be useful when +# wanting to use, for example, IP information from one group of servers +# without having to talk to them in the same playbook run to get their +# current IP information. +#fact_caching = memory + +#This option tells Ansible where to cache facts. The value is plugin dependent. +#For the jsonfile plugin, it should be a path to a local directory. +#For the redis plugin, the value is a host:port:database triplet: fact_caching_connection = localhost:6379:0 + +#fact_caching_connection=/tmp + + + +# retry files +# When a playbook fails a .retry file can be created that will be placed in ~/ +# You can enable this feature by setting retry_files_enabled to True +# and you can change the location of the files by setting retry_files_save_path + +#retry_files_enabled = False +#retry_files_save_path = ~/.ansible-retry + +# squash actions +# Ansible can optimise actions that call modules with list parameters +# when looping. Instead of calling the module once per with_ item, the +# module is called once with all items at once. Currently this only works +# under limited circumstances, and only with parameters named 'name'. +#squash_actions = apk,apt,dnf,homebrew,pacman,pkgng,yum,zypper + +# prevents logging of task data, off by default +#no_log = False + +# prevents logging of tasks, but only on the targets, data is still logged on the master/controller +#no_target_syslog = False + +# controls whether Ansible will raise an error or warning if a task has no +# choice but to create world readable temporary files to execute a module on +# the remote machine. This option is False by default for security. Users may +# turn this on to have behaviour more like Ansible prior to 2.1.x. See +# https://docs.ansible.com/ansible/become.html#becoming-an-unprivileged-user +# for more secure ways to fix this than enabling this option. +#allow_world_readable_tmpfiles = False + +# controls the compression level of variables sent to +# worker processes. At the default of 0, no compression +# is used. This value must be an integer from 0 to 9. +#var_compression_level = 9 + +# controls what compression method is used for new-style ansible modules when +# they are sent to the remote system. The compression types depend on having +# support compiled into both the controller's python and the client's python. +# The names should match with the python Zipfile compression types: +# * ZIP_STORED (no compression. available everywhere) +# * ZIP_DEFLATED (uses zlib, the default) +# These values may be set per host via the ansible_module_compression inventory +# variable +#module_compression = 'ZIP_DEFLATED' + +# This controls the cutoff point (in bytes) on --diff for files +# set to 0 for unlimited (RAM may suffer!). +#max_diff_size = 1048576 + +# This controls how ansible handles multiple --tags and --skip-tags arguments +# on the CLI. If this is True then multiple arguments are merged together. If +# it is False, then the last specified argument is used and the others are ignored. +# This option will be removed in 2.8. +#merge_multiple_cli_flags = True + +# Controls showing custom stats at the end, off by default +#show_custom_stats = True + +# Controls which files to ignore when using a directory as inventory with +# possibly multiple sources (both static and dynamic) +#inventory_ignore_extensions = ~, .orig, .bak, .ini, .cfg, .retry, .pyc, .pyo + +# This family of modules use an alternative execution path optimized for network appliances +# only update this setting if you know how this works, otherwise it can break module execution +#network_group_modules=eos, nxos, ios, iosxr, junos, vyos + +# When enabled, this option allows lookups (via variables like {{lookup('foo')}} or when used as +# a loop with `with_foo`) to return data that is not marked "unsafe". This means the data may contain +# jinja2 templating language which will be run through the templating engine. +# ENABLING THIS COULD BE A SECURITY RISK +#allow_unsafe_lookups = False + +# set default errors for all plays +#any_errors_fatal = False + +[inventory] +# enable inventory plugins, default: 'host_list', 'script', 'auto', 'yaml', 'ini', 'toml' +#enable_plugins = host_list, virtualbox, yaml, constructed + +# ignore these extensions when parsing a directory as inventory source +#ignore_extensions = .pyc, .pyo, .swp, .bak, ~, .rpm, .md, .txt, ~, .orig, .ini, .cfg, .retry + +# ignore files matching these patterns when parsing a directory as inventory source +#ignore_patterns= + +# If 'true' unparsed inventory sources become fatal errors, they are warnings otherwise. +#unparsed_is_failed=False + +[privilege_escalation] +#become=True +#become_method=sudo +#become_user=root +#become_ask_pass=False + +[paramiko_connection] + +# uncomment this line to cause the paramiko connection plugin to not record new host +# keys encountered. Increases performance on new host additions. Setting works independently of the +# host key checking setting above. +#record_host_keys=False + +# by default, Ansible requests a pseudo-terminal for commands executed under sudo. Uncomment this +# line to disable this behaviour. +#pty=False + +# paramiko will default to looking for SSH keys initially when trying to +# authenticate to remote devices. This is a problem for some network devices +# that close the connection after a key failure. Uncomment this line to +# disable the Paramiko look for keys function +#look_for_keys = False + +# When using persistent connections with Paramiko, the connection runs in a +# background process. If the host doesn't already have a valid SSH key, by +# default Ansible will prompt to add the host key. This will cause connections +# running in background processes to fail. Uncomment this line to have +# Paramiko automatically add host keys. +#host_key_auto_add = True + +[ssh_connection] + +# ssh arguments to use +# Leaving off ControlPersist will result in poor performance, so use +# paramiko on older platforms rather than removing it, -C controls compression use +#ssh_args = -C -o ControlMaster=auto -o ControlPersist=60s + +# The base directory for the ControlPath sockets. +# This is the "%(directory)s" in the control_path option +# +# Example: +# control_path_dir = /tmp/.ansible/cp +#control_path_dir = ~/.ansible/cp + +# The path to use for the ControlPath sockets. This defaults to a hashed string of the hostname, +# port and username (empty string in the config). The hash mitigates a common problem users +# found with long hostnames and the conventional %(directory)s/ansible-ssh-%%h-%%p-%%r format. +# In those cases, a "too long for Unix domain socket" ssh error would occur. +# +# Example: +# control_path = %(directory)s/%%h-%%r +#control_path = + +# Enabling pipelining reduces the number of SSH operations required to +# execute a module on the remote server. This can result in a significant +# performance improvement when enabled, however when using "sudo:" you must +# first disable 'requiretty' in /etc/sudoers +# +# By default, this option is disabled to preserve compatibility with +# sudoers configurations that have requiretty (the default on many distros). +# +#pipelining = False + +# Control the mechanism for transferring files (old) +# * smart = try sftp and then try scp [default] +# * True = use scp only +# * False = use sftp only +#scp_if_ssh = smart + +# Control the mechanism for transferring files (new) +# If set, this will override the scp_if_ssh option +# * sftp = use sftp to transfer files +# * scp = use scp to transfer files +# * piped = use 'dd' over SSH to transfer files +# * smart = try sftp, scp, and piped, in that order [default] +#transfer_method = smart + +# if False, sftp will not use batch mode to transfer files. This may cause some +# types of file transfer failures impossible to catch however, and should +# only be disabled if your sftp version has problems with batch mode +#sftp_batch_mode = False + +# The -tt argument is passed to ssh when pipelining is not enabled because sudo +# requires a tty by default. +#usetty = True + +# Number of times to retry an SSH connection to a host, in case of UNREACHABLE. +# For each retry attempt, there is an exponential backoff, +# so after the first attempt there is 1s wait, then 2s, 4s etc. up to 30s (max). +#retries = 3 + +[persistent_connection] + +# Configures the persistent connection timeout value in seconds. This value is +# how long the persistent connection will remain idle before it is destroyed. +# If the connection doesn't receive a request before the timeout value +# expires, the connection is shutdown. The default value is 30 seconds. +#connect_timeout = 30 + +# The command timeout value defines the amount of time to wait for a command +# or RPC call before timing out. The value for the command timeout must +# be less than the value of the persistent connection idle timeout (connect_timeout) +# The default value is 30 second. +#command_timeout = 30 + +[accelerate] +#accelerate_port = 5099 +#accelerate_timeout = 30 +#accelerate_connect_timeout = 5.0 + +# The daemon timeout is measured in minutes. This time is measured +# from the last activity to the accelerate daemon. +#accelerate_daemon_timeout = 30 + +# If set to yes, accelerate_multi_key will allow multiple +# private keys to be uploaded to it, though each user must +# have access to the system via SSH to add a new key. The default +# is "no". +#accelerate_multi_key = yes + +[selinux] +# file systems that require special treatment when dealing with security context +# the default behaviour that copies the existing context or uses the user default +# needs to be changed to use the file system dependent context. +#special_context_filesystems=nfs,vboxsf,fuse,ramfs,9p + +# Set this to yes to allow libvirt_lxc connections to work without SELinux. +#libvirt_lxc_noseclabel = yes + +[colors] +#highlight = white +#verbose = blue +#warn = bright purple +#error = red +#debug = dark gray +#deprecate = purple +#skip = cyan +#unreachable = red +#ok = green +#changed = yellow +#diff_add = green +#diff_remove = red +#diff_lines = cyan + + +[diff] +# Always print diff when running ( same as always running with -D/--diff ) +# always = no + +# Set how many context lines to show in diff +# context = 3 diff --git a/deploy/deploy.yml b/deploy/deploy.yml new file mode 100755 index 00000000..08bd202c --- /dev/null +++ b/deploy/deploy.yml @@ -0,0 +1,12 @@ +- hosts: "{{ env }}" + become: yes + tasks: + - name: remove any previous app services + shell: | + if [ `docker service ls | grep -v NAME | grep mysvc | awk '{print $2}' | wc -l` -gt 0 ]; then + docker service rm `docker service ls | grep -v NAME | grep mysvc | awk '{print $2}'` + else + echo "No Service found" + fi + - name: deploy app + command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/addressbook:{{ build }} diff --git a/deploy/inv b/deploy/inv new file mode 100755 index 00000000..70e32ed9 --- /dev/null +++ b/deploy/inv @@ -0,0 +1,18 @@ +[qa] +ip1 +ip2 + +[prod] +ip1 +ip2 + +[qa:vars] +ansible_user=devops +ansible_ssh_pass=devops +ansible_sudo_pass=devops + +[prod:vars] +ansible_user=devops +ansible_ssh_pass=devops +ansible_sudo_pass=devops + diff --git a/deploy/sampleapp-deploy-k8s.yml b/deploy/sampleapp-deploy-k8s.yml new file mode 100755 index 00000000..7a0b9b9d --- /dev/null +++ b/deploy/sampleapp-deploy-k8s.yml @@ -0,0 +1,36 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + name: addressbook + labels: + app: addressbookapp +spec: + replicas: 2 + selector: + matchLabels: + app: addressbookapp + template: + metadata: + labels: + app: addressbookapp + spec: + containers: + - name: addressbookapp + image: lerndevops/addressbook + ports: + - containerPort: 8080 + +--- + +kind: Service +apiVersion: v1 +metadata: + name: addressbookapp-svc +spec: + type: NodePort + selector: + app: addressbookapp + ports: + - protocol: TCP + port: 8080 + nodePort: 30002 diff --git a/Jenkinsfilek8s b/jenkinsfile-k8s similarity index 100% rename from Jenkinsfilek8s rename to jenkinsfile-k8s diff --git a/Jenkinsfile-linux b/jenkinsfile-linux similarity index 100% rename from Jenkinsfile-linux rename to jenkinsfile-linux diff --git a/Jenkinsfile-win b/jenkinsfile-win similarity index 100% rename from Jenkinsfile-win rename to jenkinsfile-win From d3b9b38d65a3616ac1a2fdf957e180cc28a86b8a Mon Sep 17 00:00:00 2001 From: lerndevops Date: Mon, 14 Oct 2019 22:41:25 -0700 Subject: [PATCH 036/269] update samplejavaapp --- build.properties | 60 ---- build.xml | 474 -------------------------------- deploy/deploy.yml | 2 +- deploy/sampleapp-deploy-k8s.yml | 16 +- jenkinsfile-k8s | 8 +- jenkinsfile-linux | 7 +- 6 files changed, 14 insertions(+), 553 deletions(-) delete mode 100644 build.properties delete mode 100644 build.xml diff --git a/build.properties b/build.properties deleted file mode 100644 index 886c42fd..00000000 --- a/build.properties +++ /dev/null @@ -1,60 +0,0 @@ -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# Copyright 2015, Seshagiri Sriram. All rights reserved. -# -# Created on: Feb 02, 2015, Seshagiri Sriram -# Updated: June 20,2016 fixed some property paths.. -# File Name : build.properties -# -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# ****** NOTE: ALL PARAMETERS AND VALUES IN THIS FILE ARE CASE SENSITIVE ****** -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# Properties file -# Modify the following properties before calling the ant build -# -# This build drops all the existing directories (mentioned in this properties file) before creating them -# The JAR file structure created by this build is -# |-- ReportGenerator.jar This is defined in build.xml -# | |-- META-INF -# |-- lib Third party jars -# |-- All property files go in here..... -# -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# Build Details -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# The below are general for *** ALL *** Projects and defined inside build.xml or passed via -D options. DO NOT CHANGE -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# |Property Description -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# |build.basesrcdir Location where the project is found. Passed to this script via -Dbasesrcdir= -# |maven.build.finalName Final name - hardcoded into build.xml e.g. X-1.0.0-SNAPSHOT.jar -# |maven.build.dir Location relative to buildsrcdir where build will be done. usually target -# |maven.build.outputDir Usually target/classes. -# |maven.build.srcdir location of source under buid.basesrcdir -# |maven.build.resourceDir location of resources under build.basesrcdir -# |maven.build.testDir Location of test classes -# |maven.build.testResourceDir Location of test resources -# |maven.build.testOutputDir Location of test class compilation -# |maven.test.reports Where test reports (from JUNIT) will be located. -# |maven.build.pmddir Location where PMD rules and XSL will belocated. -# |maven.reporting.outputDirectory Location of reports from PMD -# |project.3rdpartylibdir lib under build.basesrcdir -# |build.type dev,qa, or prod. passed via -Dbuildtype={dev|qa|prod} -# |environment.type.default Value if build.type is not passed. defaults to dev -- DO NOT CHANGE -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- - -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# Per User configuration..... Change for local environmnent -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -# -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- -ant.home=c:/Apps/ant -project.build.outputDirectory=${maven.build.outputDir} -project.build.directory=${maven.build.dir} -maven.repo.local=e\:/repos -maven.settings.offline=false -project.build.sourceEncoding=UTF-8 -maven.settings.interactiveMode=false -maven.build.version=V1.2 -maven.test.skip=false -pmd.installpath=c:/Apps/pmd-bin-5.2.3/lib -# ---------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/build.xml b/build.xml deleted file mode 100644 index 246417e2..00000000 --- a/build.xml +++ /dev/null @@ -1,474 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - =================================== WARNING ========================================== - JUnit is not present in the test classpath or your $ANT_HOME/lib directory. Tests not executed. - ======================================================================================= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Class Path: ${toString:cobertura.classpath} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/deploy/deploy.yml b/deploy/deploy.yml index 08bd202c..95c95323 100755 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -9,4 +9,4 @@ echo "No Service found" fi - name: deploy app - command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/addressbook:{{ build }} + command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/samplejavaapp:{{ build }} diff --git a/deploy/sampleapp-deploy-k8s.yml b/deploy/sampleapp-deploy-k8s.yml index 7a0b9b9d..089311fd 100755 --- a/deploy/sampleapp-deploy-k8s.yml +++ b/deploy/sampleapp-deploy-k8s.yml @@ -1,22 +1,22 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: addressbook + name: samplejavaapp labels: - app: addressbookapp + app: samplejavaapp spec: replicas: 2 selector: matchLabels: - app: addressbookapp + app: samplejavaapp template: metadata: labels: - app: addressbookapp + app: samplejavaapp spec: containers: - - name: addressbookapp - image: lerndevops/addressbook + - name: samplejavaapp + image: lerndevops/samplejavaapp ports: - containerPort: 8080 @@ -25,11 +25,11 @@ spec: kind: Service apiVersion: v1 metadata: - name: addressbookapp-svc + name: samplejavaapp-svc spec: type: NodePort selector: - app: addressbookapp + app: samplejavaapp ports: - protocol: TCP port: 8080 diff --git a/jenkinsfile-k8s b/jenkinsfile-k8s index c2fc513f..4fe19d02 100644 --- a/jenkinsfile-k8s +++ b/jenkinsfile-k8s @@ -3,7 +3,7 @@ pipeline { stages { stage('checkout repo') { steps { - git url: 'https://github.com/lerndevops/DevOpsClassCodes.git ' + git url: 'https://github.com/lerndevops/samplejavaapp.git' } } stage('build artifact') { @@ -13,7 +13,7 @@ pipeline { } stage('build docker image') { steps { - sh 'docker build -t lerndevops/addressbook .' + sh 'docker build -t lerndevops/samplejavaapp .' } } stage('push docker image') { @@ -21,12 +21,12 @@ pipeline { withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { sh "docker login -u lerndevops -p ${DOCKER_HUB_PWD}" } - sh 'docker push lerndevops/addressbook' + sh 'docker push lerndevops/samplejavaapp' } } stage('Deploy to K8s') { steps { - sh 'kubectl apply -f addressbook-deploy-k8s.yml' + sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } } } diff --git a/jenkinsfile-linux b/jenkinsfile-linux index e4d2f525..c65297ef 100644 --- a/jenkinsfile-linux +++ b/jenkinsfile-linux @@ -3,14 +3,12 @@ pipeline { stages { stage('compile') { steps { - echo 'compiling..' - git url: 'https://github.com/lerndevops/DevOpsClassCodes' + git url: 'https://github.com/lerndevops/samplejavaapp.git' sh script: 'mvn compile' } } stage('codereview-pmd') { steps { - echo 'codereview..' sh script: 'mvn -P metrics pmd:pmd' } post { @@ -21,7 +19,6 @@ pipeline { } stage('unit-test') { steps { - echo 'codereview..' sh script: 'mvn test' } post { @@ -32,7 +29,6 @@ pipeline { } stage('metric-check') { steps { - echo 'unit test..' sh script: 'mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { @@ -43,7 +39,6 @@ pipeline { } stage('package') { steps { - echo 'metric-check..' sh script: 'mvn package' } } From 5dd29828bcec2505edcc3b1baa4bc0e41cef2ce4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 15 Oct 2019 11:14:39 +0530 Subject: [PATCH 037/269] Update jenkinsfile-linux --- jenkinsfile-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfile-linux b/jenkinsfile-linux index c65297ef..0b9ac329 100644 --- a/jenkinsfile-linux +++ b/jenkinsfile-linux @@ -39,7 +39,7 @@ pipeline { } stage('package') { steps { - sh script: 'mvn package' + sh script: 'mvn clean package' } } } From 6d7b02699962225dfedcde01b21b0d3975aa1ac8 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 19 Oct 2019 11:10:39 +0530 Subject: [PATCH 038/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab82509b..f9a35a4f 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.7 +Sample Java Applicaiton V2.8 From 13a0a0868d899c4dd330a6f78649a0e492e1434c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 19 Oct 2019 11:47:56 +0530 Subject: [PATCH 039/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9a35a4f..759ac5ce 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.8 +Sample Java Applicaiton V2.9 From c8089f9601facabd465dffc0edbedadc6aa1ade4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 19 Oct 2019 12:10:26 +0530 Subject: [PATCH 040/269] Create test --- test | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 00000000..dfc5046d --- /dev/null +++ b/test @@ -0,0 +1,4 @@ +http://18.222.120.108:9000 sonarqube --- admin/admin + + +http://18.222.120.108:8081/artifactory ----- JFrog --- admin/password From c81ca7c683595b9d399e71f4ddc037e25d79ccc1 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 16 Nov 2019 12:17:37 +0530 Subject: [PATCH 041/269] Delete test --- test | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 test diff --git a/test b/test deleted file mode 100644 index dfc5046d..00000000 --- a/test +++ /dev/null @@ -1,4 +0,0 @@ -http://18.222.120.108:9000 sonarqube --- admin/admin - - -http://18.222.120.108:8081/artifactory ----- JFrog --- admin/password From 8ae87a45c6a7a0beb782d457621e90c68c04657b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 17 Nov 2019 15:00:12 +0530 Subject: [PATCH 042/269] Update deploy.yml --- deploy/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy.yml b/deploy/deploy.yml index 95c95323..08bd202c 100755 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -9,4 +9,4 @@ echo "No Service found" fi - name: deploy app - command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/samplejavaapp:{{ build }} + command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/addressbook:{{ build }} From 1828bfe55171e077d247e38940f1da17388c0a27 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 18 Nov 2019 13:42:28 +0530 Subject: [PATCH 043/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 759ac5ce..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.9 +Sample Java Applicaiton V2.0 From 482a99130c40b923c3a028c64c0d7aea1dbd9265 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 23 Nov 2019 12:41:04 +0530 Subject: [PATCH 044/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..c4f8694c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.1 From 148665a21b54da0eaf84e62fae6e82c619fa2e39 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 24 Nov 2019 14:19:04 +0530 Subject: [PATCH 045/269] Update deploy.yml --- deploy/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy.yml b/deploy/deploy.yml index 08bd202c..95c95323 100755 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -9,4 +9,4 @@ echo "No Service found" fi - name: deploy app - command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/addressbook:{{ build }} + command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/samplejavaapp:{{ build }} From 9286effef892789d63d504894bdd25328b5273a3 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 1 Dec 2019 21:50:23 +0530 Subject: [PATCH 046/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4f8694c..6a584147 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.1 +Sample Java Applicaiton V2.2 From b9e18581514de9fa7cf14ce69ca6ae60b06dacec Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Tue, 3 Dec 2019 19:57:59 +0530 Subject: [PATCH 047/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c960df01..56d9bac3 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V1.0 +Sample Java Applicaiton V1.1 From 4a6e1258737ce823633743e9ef00287c6050e35e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 4 Dec 2019 12:18:30 +0530 Subject: [PATCH 048/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a584147..fb9520d8 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.2 +Sample Java Applicaiton V2.3 From b89ea49b9c05c6b347361fe02721cb001fd2ddd7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 4 Dec 2019 12:26:52 +0530 Subject: [PATCH 049/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb9520d8..28cc7f54 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.3 +Sample Java Applicaiton V2.4 From c9e89b2ff0b81a1b5e74bc5e5f6ba379e9f91e84 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 4 Dec 2019 14:48:37 +0530 Subject: [PATCH 050/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28cc7f54..a4a682d8 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.4 +Sample Java Applicaiton V2.5 From 9882bf694ab993955fc729d028791ea10f81086b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 4 Dec 2019 14:53:27 +0530 Subject: [PATCH 051/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a4a682d8..abd7e84b 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.5 +Sample Java Applicaiton V2.6 From 799380763596ecd7fc739d9987fa335033f0ef88 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 4 Dec 2019 16:58:33 +0530 Subject: [PATCH 052/269] Update jenkinsfile-linux --- jenkinsfile-linux | 3 +++ 1 file changed, 3 insertions(+) diff --git a/jenkinsfile-linux b/jenkinsfile-linux index 0b9ac329..3dbd9099 100644 --- a/jenkinsfile-linux +++ b/jenkinsfile-linux @@ -1,5 +1,8 @@ pipeline { agent any + tools { + maven 'M3' + } stages { stage('compile') { steps { From 270128fdc4128a4c45f466f12b922d1d283455e2 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 4 Dec 2019 16:59:10 +0530 Subject: [PATCH 053/269] Update jenkinsfile-linux --- jenkinsfile-linux | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jenkinsfile-linux b/jenkinsfile-linux index 3dbd9099..a98e122d 100644 --- a/jenkinsfile-linux +++ b/jenkinsfile-linux @@ -1,8 +1,6 @@ pipeline { agent any - tools { - maven 'M3' - } + stages { stage('compile') { steps { From 3642af23a44c3442545e738126aa9833358823bf Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 5 Dec 2019 17:36:30 +0530 Subject: [PATCH 054/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index abd7e84b..ab82509b 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.6 +Sample Java Applicaiton V2.7 From b6c0688b9d9ff79009d8b1910aa1ef4c9f49bbad Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Tue, 10 Dec 2019 14:56:53 +0530 Subject: [PATCH 055/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 56d9bac3..dd94b997 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V1.1 +Sample Java Applicaiton V1.2 From 4b48b5175735ae4baeba9d19087373d89e74f912 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 12 Dec 2019 14:34:27 +0530 Subject: [PATCH 056/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab82509b..f9a35a4f 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.7 +Sample Java Applicaiton V2.8 From 4ad1a394b74c633f917c13a897dcaeb81b4d7e7a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 14 Dec 2019 12:02:37 +0530 Subject: [PATCH 057/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f9a35a4f..759ac5ce 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.8 +Sample Java Applicaiton V2.9 From 44a3e129af3a6bb1db854dbd9d7fa4158098c290 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 2 Jan 2020 08:52:53 +0530 Subject: [PATCH 058/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 759ac5ce..d3585c19 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.9 +Sample Java Applicaiton V2 From deabb48f11990be4272969b83ac14b8fbb09ab2c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 2 Jan 2020 08:56:45 +0530 Subject: [PATCH 059/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3585c19..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2 +Sample Java Applicaiton V2.0 From 9eddf5e82495b7b1c66d9a1c39588d5e7bc8e38a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 3 Jan 2020 08:03:35 +0530 Subject: [PATCH 060/269] Update jenkinsfile-linux --- jenkinsfile-linux | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/jenkinsfile-linux b/jenkinsfile-linux index a98e122d..82dda924 100644 --- a/jenkinsfile-linux +++ b/jenkinsfile-linux @@ -5,12 +5,12 @@ pipeline { stage('compile') { steps { git url: 'https://github.com/lerndevops/samplejavaapp.git' - sh script: 'mvn compile' + sh script: '/opt/apache-maven-3.6.3/bin/mvn compile' } } stage('codereview-pmd') { steps { - sh script: 'mvn -P metrics pmd:pmd' + sh script: '/opt/apache-maven-3.6.3/bin/mvn -P metrics pmd:pmd' } post { success { @@ -20,7 +20,7 @@ pipeline { } stage('unit-test') { steps { - sh script: 'mvn test' + sh script: '/opt/apache-maven-3.6.3/bin/mvn test' } post { success { @@ -30,7 +30,7 @@ pipeline { } stage('metric-check') { steps { - sh script: 'mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/apache-maven-3.6.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -40,7 +40,7 @@ pipeline { } stage('package') { steps { - sh script: 'mvn clean package' + sh script: '/opt/apache-maven-3.6.3/bin/mvn clean package' } } } From d3dca2a09062ba3792e966608bcc2012b1f5230d Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 11 Jan 2020 10:50:05 +0530 Subject: [PATCH 061/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..c4f8694c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.1 From 1728a58cde9a6f315810977cf6b5c061b5abc968 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 11 Jan 2020 12:04:13 +0530 Subject: [PATCH 062/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4f8694c..d96e3679 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.1 +Sample Java Applicaiton V2.0 From 88524abc3b190d0e23a121e33b6b1d6babd7887f Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 11 Jan 2020 19:00:40 +0530 Subject: [PATCH 063/269] Update inv --- deploy/inv | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/inv b/deploy/inv index 70e32ed9..1be7c290 100755 --- a/deploy/inv +++ b/deploy/inv @@ -8,11 +8,11 @@ ip2 [qa:vars] ansible_user=devops -ansible_ssh_pass=devops -ansible_sudo_pass=devops +ansible_ssh_pass=jdokuans +ansible_sudo_pass=jdokuans [prod:vars] ansible_user=devops -ansible_ssh_pass=devops -ansible_sudo_pass=devops +ansible_ssh_pass=jdokuans +ansible_sudo_pass=jdokuans From 17c2665267762777dc6ab5af34d9fb84f735b311 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 25 Jan 2020 12:20:09 +0530 Subject: [PATCH 064/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d96e3679..c4f8694c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.1 From 3aaec714917760a9747cd4f239007051cd279d93 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 26 Jan 2020 11:46:54 +0530 Subject: [PATCH 065/269] Update deploy.yml --- deploy/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy.yml b/deploy/deploy.yml index 95c95323..cfb3212f 100755 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -9,4 +9,4 @@ echo "No Service found" fi - name: deploy app - command: docker service create --name mysvc --replicas 4 -p 9080:8080 lerndevops/samplejavaapp:{{ build }} + command: docker service create --name mysvc --replicas 2 -p 9080:8080 lerndevops/samplejavaapp:{{ build }} From 6a7410549c5d2aeb22d1d25b6172e93acdf1732a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 29 Jan 2020 08:38:56 +0530 Subject: [PATCH 066/269] Update jenkinsfile-k8s --- jenkinsfile-k8s | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfile-k8s b/jenkinsfile-k8s index 4fe19d02..c58f0d64 100644 --- a/jenkinsfile-k8s +++ b/jenkinsfile-k8s @@ -8,7 +8,7 @@ pipeline { } stage('build artifact') { steps { - sh 'mvn clean package' + sh '/opt/apache-maven-3.6.2/bin/mvn clean package' } } stage('build docker image') { From 93f33c39f711332b04cce33261f3383ed810da41 Mon Sep 17 00:00:00 2001 From: lerndevops Date: Fri, 14 Feb 2020 08:00:23 -0800 Subject: [PATCH 067/269] gradle --- .gitignore | 1 + build.gradle | 66 ++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 58695 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 183 +++++++++++++++++++++++ gradlew.bat | 100 +++++++++++++ settings.gradle | 5 + 7 files changed, 360 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..3bb19ffd --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.gradle/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..6a4af0f8 --- /dev/null +++ b/build.gradle @@ -0,0 +1,66 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +plugins { + id 'java' + id 'maven-publish' +} + +repositories { + mavenLocal() + maven { + url = 'https://maven.vaadin.com/vaadin-prereleases' + } + + maven { + url = 'http://maven.vaadin.com/vaadin-addons' + } + + maven { + url = 'http://oss.sonatype.org/content/repositories/vaadin-snapshots/' + } + + maven { + url = 'https://repo.maven.apache.org/maven2' + } +} + +dependencies { + implementation 'com.vaadin:vaadin-compatibility-server:8.0.0.alpha2' + implementation 'com.vaadin:vaadin-compatibility-shared:8.0.0.alpha2' + implementation 'com.vaadin:vaadin-compatibility-client-compiled:8.0.0.alpha2' + implementation 'com.vaadin:vaadin-themes:8.0.0.alpha2' + implementation 'javax.servlet:javax.servlet-api:3.0.1' + implementation 'commons-beanutils:commons-beanutils:1.9.2' + implementation 'log4j:log4j:1.2.9' + implementation 'org.slf4j:slf4j-api:1.7.7' + implementation 'org.slf4j:slf4j-simple:1.7.7' + implementation 'org.slf4j:slf4j-log4j12:1.7.7' + implementation 'commons-httpclient:commons-httpclient:3.1' + implementation 'org.apache.commons:commons-lang3:3.1' + implementation 'org.json:json:20140107' + implementation 'org.codehaus.jackson:jackson-jaxrs:1.9.4' + implementation 'com.sun.xml.security:xml-security-impl:1.0' + testImplementation 'junit:junit:4.7' +} + +group = 'com.devopsdemo.tutorial' +// version = '2.0' +// description = 'Vaadin Sampleapp example' +sourceCompatibility = '1.8' + +configurations.all { +} + +publishing { + publications { + maven(MavenPublication) { + from(components.java) + } + } +} + +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..f3d88b1c2faf2fc91d853cd5d4242b5547257070 GIT binary patch literal 58695 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 literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..1b16c34a --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..2fe81a7d --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..24467a14 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..c1d4e574 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,5 @@ +/* + * This file was generated by the Gradle 'init' task. + */ + +rootProject.name = 'sampleapp' From 14a3efc28f31281792d664ba2fd020ff51b14af4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 13 Mar 2020 08:18:26 +0530 Subject: [PATCH 068/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4f8694c..6a584147 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.1 +Sample Java Applicaiton V2.2 From eb2c1cd467a8a9fa7f800a248f51a0e57fb4342a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 13 Mar 2020 08:55:01 +0530 Subject: [PATCH 069/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a584147..c4f8694c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.2 +Sample Java Applicaiton V2.1 From 7c59382f05768a777855348688461d8e48952248 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 5 Apr 2020 12:38:22 +0530 Subject: [PATCH 070/269] Update inv --- deploy/inv | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/deploy/inv b/deploy/inv index 1be7c290..5121ecac 100755 --- a/deploy/inv +++ b/deploy/inv @@ -6,13 +6,3 @@ ip2 ip1 ip2 -[qa:vars] -ansible_user=devops -ansible_ssh_pass=jdokuans -ansible_sudo_pass=jdokuans - -[prod:vars] -ansible_user=devops -ansible_ssh_pass=jdokuans -ansible_sudo_pass=jdokuans - From f5a8e29307c6e52b25b138f6cc5f6349e15f99a4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 23 Apr 2020 07:24:07 +0530 Subject: [PATCH 071/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c4f8694c..6a584147 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.1 +Sample Java Applicaiton V2.2 From ca030070a3bb6bdeba7b4390b7abac5675b25426 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 23 Apr 2020 08:12:17 +0530 Subject: [PATCH 072/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6a584147..c4f8694c 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V2.2 +Sample Java Applicaiton V2.1 From e410ee1328a833bf3ea04a4bb193021c09b08714 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 25 Apr 2020 12:48:07 +0530 Subject: [PATCH 073/269] Update settings.gradle --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index c1d4e574..93eebce9 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ /* - * This file was generated by the Gradle 'init' task. + * This file was generated by the Gradle 'init' task.. */ rootProject.name = 'sampleapp' From 18355833633253194564f0a350166839ff4d4c98 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 25 Apr 2020 12:53:19 +0530 Subject: [PATCH 074/269] Update settings.gradle --- settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle b/settings.gradle index 93eebce9..c1d4e574 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,5 @@ /* - * This file was generated by the Gradle 'init' task.. + * This file was generated by the Gradle 'init' task. */ rootProject.name = 'sampleapp' From ed5fb73cd581068c9821c91458052c845f6654a9 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 25 Apr 2020 16:42:18 +0530 Subject: [PATCH 075/269] Update GenericComparator.java --- src/main/java/com/devopsdemo/utilities/GenericComparator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/devopsdemo/utilities/GenericComparator.java b/src/main/java/com/devopsdemo/utilities/GenericComparator.java index a5c3ee8b..286cac56 100644 --- a/src/main/java/com/devopsdemo/utilities/GenericComparator.java +++ b/src/main/java/com/devopsdemo/utilities/GenericComparator.java @@ -5,7 +5,7 @@ import java.util.Comparator; import java.util.Date; -/** +/**** * Sorting - Generic Comparator * * @author Seshagiri Sriram From 1dcc54811ffb5ecab0acaa6b8c9205fa72ac1427 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Wed, 6 May 2020 11:36:00 +0530 Subject: [PATCH 076/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index dd94b997..8e4a282d 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ Sample Java Applicaiton V1.2 +ravi change From 55d9dac8aee9cf3a0b9d505d6036bb43bc31dbaf Mon Sep 17 00:00:00 2001 From: lerndevops Date: Fri, 15 May 2020 07:05:46 +0000 Subject: [PATCH 077/269] kube --- deploy/deploy-kube.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 deploy/deploy-kube.yml diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml new file mode 100755 index 00000000..0bef678f --- /dev/null +++ b/deploy/deploy-kube.yml @@ -0,0 +1,21 @@ +- hosts: "{{ env }}" + become: yes + tasks: + - name: remove any previous app services + shell: | + if [ `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep myapp | wc -l` -gt 0 ]; then + kubectl delete deploy `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep myapp` + else + echo "No app deployments found" + fi + if [ `kubectl get svc | grep myapp-svc | awk '{print $1}' | wc -l` -gt 0 ]; then + kubectl delete svc `kubectl get svc | grep myapp-svc | awk '{print $1}'` + else + echo "No app service found" + fi + - name: deploy app + command: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} + - name: increase replicas + command: kubectl scale deploy myapp --replicas=2 + - name: deploy service + command: kubectl expose deploy myapp --name myapp-svc --port 8080 --type NodePort From 418e8a58ddbdfa5015cb350e0786bbd38e1b015a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 18 May 2020 20:56:16 +0530 Subject: [PATCH 078/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 780ce6a8..adf45577 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.2 +Sample Java Applicaiton V1.3 ravi change From 284eaea8ec6217d1dc55233620747d0baa1b5095 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 18 May 2020 21:02:18 +0530 Subject: [PATCH 079/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index adf45577..f813bad5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.3 +Sample Java Applicaiton V1.4 ravi change From 46c71c01eb40ae969fe88a491f44bc546c2445eb Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 19 May 2020 19:24:06 +0530 Subject: [PATCH 080/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f813bad5..796fee96 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.4 +Sample Java Applicaiton V1.5 ravi change From 8783eab78c9e358458234b2330629828182403bd Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 19 May 2020 20:16:31 +0530 Subject: [PATCH 081/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 796fee96..aa415588 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.5 +Sample Java Applicaiton V1.6 ravi change From a6dfcc22675ddbd929bf4433c0675def678e1e78 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 19 May 2020 20:20:23 +0530 Subject: [PATCH 082/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index aa415588..dc027efe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.6 +Sample Java Applicaiton V1.7 ravi change From cec652576fbae594f2224e0be3438a6968622dc3 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 24 May 2020 22:53:59 +0530 Subject: [PATCH 083/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc027efe..8b6325fe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.7 +Sample Java Applicaiton V1.8 ravi change From 77d7104b92bd47beada729eec4a7b83d086d6b55 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 24 May 2020 22:59:19 +0530 Subject: [PATCH 084/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8b6325fe..dc027efe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V1.7 ravi change From ebb8313a0279b7c1164c29de51067a1a3c39c146 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 30 May 2020 15:55:37 +0530 Subject: [PATCH 085/269] Update jenkinsfile-linux --- jenkinsfile-linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkinsfile-linux b/jenkinsfile-linux index 82dda924..ca5e0dfe 100644 --- a/jenkinsfile-linux +++ b/jenkinsfile-linux @@ -28,7 +28,7 @@ pipeline { } } } - stage('metric-check') { + stage('codecoverage') { steps { sh script: '/opt/apache-maven-3.6.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } From 9bad2d46ae2d6701b5da3ec1eb0f68dd60b5de04 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 5 Jun 2020 07:40:20 +0530 Subject: [PATCH 086/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dc027efe..fb39d865 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Sample Java Applicaiton V1.7 -ravi change + From 2daa12757e88de27dafb0a8dbfe11a484eb2e054 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 5 Jun 2020 07:42:49 +0530 Subject: [PATCH 087/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb39d865..ec175362 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.7 +Sample Java Applicaiton V1.8 From c3e1190263f7c455911156c7c4f14af0ddb261c1 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 5 Jun 2020 07:52:31 +0530 Subject: [PATCH 088/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec175362..ccb72ea3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Sample Java Applicaiton V1.8 - +naresh From da53a12caeb11f0008ac055d7a7b4ae289e88ce7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 5 Jun 2020 21:20:44 +0530 Subject: [PATCH 089/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ccb72ea3..ec175362 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Sample Java Applicaiton V1.8 -naresh + From 0068f6ad2ebdbcd9720e7e15367e14c338890e24 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 5 Jun 2020 21:27:44 +0530 Subject: [PATCH 090/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec175362..c7f20043 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Sample Java Applicaiton V1.8 - +Testing WebHook From e3fd90ec98c081d232d24e3a824ad611368e06a0 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 6 Jun 2020 20:18:01 +0530 Subject: [PATCH 091/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7f20043..ec175362 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Sample Java Applicaiton V1.8 -Testing WebHook + From b50f03fbf6c33dc9c627f393eda41939f2ca4fc4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 6 Jun 2020 21:06:39 +0530 Subject: [PATCH 092/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec175362..7336f36e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V1.9 From a1b7d5f1366688e0e9320bca8e29642a85b5425d Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 8 Jun 2020 21:34:49 +0530 Subject: [PATCH 093/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7336f36e..ec175362 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.9 +Sample Java Applicaiton V1.8 From 85d14b35151206742b695eb842d7824f9b3f8634 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 11 Jun 2020 20:09:28 +0530 Subject: [PATCH 094/269] Update deploy.yml --- deploy/deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy.yml b/deploy/deploy.yml index cfb3212f..a5c70808 100755 --- a/deploy/deploy.yml +++ b/deploy/deploy.yml @@ -9,4 +9,4 @@ echo "No Service found" fi - name: deploy app - command: docker service create --name mysvc --replicas 2 -p 9080:8080 lerndevops/samplejavaapp:{{ build }} + command: docker service create --name mysvc --replicas 2 -p 9080:8080 lerndevops/sampleapp:{{ build }} From 8b761b2af0dbd3fb3c518e28f4b71a037f900053 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 26 Jun 2020 19:27:05 +0530 Subject: [PATCH 095/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 0bef678f..36f2a1bd 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -14,7 +14,7 @@ echo "No app service found" fi - name: deploy app - command: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} + command: kubectl create deploy myapp --image=lerndevops/sampleapp:{{ build }} - name: increase replicas command: kubectl scale deploy myapp --replicas=2 - name: deploy service From c36f7b34bc33ee0a3fb2b2fe851a7734e020623e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 6 Jul 2020 20:53:07 +0530 Subject: [PATCH 096/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec175362..7336f36e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V1.9 From cfcdce3df07362128bc31b3f7558df6bcd1f640a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 6 Jul 2020 21:57:39 +0530 Subject: [PATCH 097/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7336f36e..1c2a4cd6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.9 +Sample Java Applicaiton V1.5 From f4a08ff9648106d3164a1a44c28b3efe5f086284 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 7 Jul 2020 17:07:12 +0530 Subject: [PATCH 098/269] Rename jenkinsfile-linux to Jenkinsfile --- jenkinsfile-linux => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename jenkinsfile-linux => Jenkinsfile (100%) diff --git a/jenkinsfile-linux b/Jenkinsfile similarity index 100% rename from jenkinsfile-linux rename to Jenkinsfile From 31528c99a8e3f442009ac9fcabea7f380ab73517 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 7 Jul 2020 17:17:07 +0530 Subject: [PATCH 099/269] Added Jenkinsfile --- Jenkinsfile | 92 +++++++++++++++++++++++++++++------------------------ 1 file changed, 50 insertions(+), 42 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ca5e0dfe..cd32c1b8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,47 +1,55 @@ pipeline { - agent any - - stages { - stage('compile') { - steps { - git url: 'https://github.com/lerndevops/samplejavaapp.git' - sh script: '/opt/apache-maven-3.6.3/bin/mvn compile' - } - } - stage('codereview-pmd') { - steps { - sh script: '/opt/apache-maven-3.6.3/bin/mvn -P metrics pmd:pmd' - } - post { - success { - pmd canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/pmd.xml', unHealthy: '' - } - } - } - stage('unit-test') { - steps { - sh script: '/opt/apache-maven-3.6.3/bin/mvn test' - } - post { - success { - junit 'target/surefire-reports/*.xml' - } - } + agent any + stages { + stage('compile') { + steps { + git 'https://github.com/lerndevops/samplejavaapp.git' + sh '/opt/apache-maven-3.6.3/bin/mvn compile' + sleep 10 + } + } + + stage('codereview-pmd') { + post { + success { + pmd(canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/pmd.xml', unHealthy: '') } - stage('codecoverage') { - steps { - sh script: '/opt/apache-maven-3.6.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' - } - post { - success { - cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false - } - } + + } + steps { + sh '/opt/apache-maven-3.6.3/bin/mvn -P metrics pmd:pmd' + } + } + + stage('unit-test') { + post { + success { + junit 'target/surefire-reports/*.xml' } - stage('package') { - steps { - sh script: '/opt/apache-maven-3.6.3/bin/mvn clean package' - } + + } + steps { + sh '/opt/apache-maven-3.6.3/bin/mvn test' + } + } + + stage('codecoverage') { + post { + success { + cobertura(autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false) } + + } + steps { + sh '/opt/apache-maven-3.6.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + } + + stage('package') { + steps { + sh '/opt/apache-maven-3.6.3/bin/mvn clean package' + } } -} + + } +} \ No newline at end of file From 729fc2632bfbd1e0c76645ce691c355b035855a9 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 9 Jul 2020 18:44:02 +0530 Subject: [PATCH 100/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1c2a4cd6..51303d71 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.5 +Sample Java Applicaiton V1.6 From cb216c9822f2c493f9435bab39a138b0386f4699 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 9 Jul 2020 18:49:31 +0530 Subject: [PATCH 101/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51303d71..fb39d865 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.6 +Sample Java Applicaiton V1.7 From d55ccb92e91f09b9498474b0779fdc8b0b199d9e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 10 Jul 2020 18:34:07 +0530 Subject: [PATCH 102/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fb39d865..ec175362 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.7 +Sample Java Applicaiton V1.8 From 6890f1734529f062838d1b29c0a6eb0c0570d864 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 10 Jul 2020 18:38:22 +0530 Subject: [PATCH 103/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ec175362..7336f36e 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V1.9 From fbd610d1e7daace2f70a2845527d90f41e0e6345 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 12 Jul 2020 21:46:46 +0530 Subject: [PATCH 104/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7336f36e..a4ab9848 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.9 +Sample Java Applicaiton V1.10 From 864aab4c0900a0f77c46952d9afd49b21b68cf40 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 12 Jul 2020 22:03:56 +0530 Subject: [PATCH 105/269] Update pom.xml --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 9b9f8f49..f1830af6 100644 --- a/pom.xml +++ b/pom.xml @@ -102,6 +102,11 @@ slf4j-api 1.7.7 + + com.sun.java + tools + 11.0.1 + org.slf4j slf4j-simple From 7ab1496177b9661d491aa3c3f0f1d6398fc8d7cd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Jul 2020 16:34:15 +0000 Subject: [PATCH 106/269] Bump commons-beanutils from 1.9.2 to 1.9.4 Bumps commons-beanutils from 1.9.2 to 1.9.4. Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f1830af6..f8b75017 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ commons-beanutils commons-beanutils - 1.9.2 + 1.9.4 jar From 2d505d5cbee4a0a7fb7a180c1f59e38f4746b1b3 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 12 Jul 2020 22:09:41 +0530 Subject: [PATCH 107/269] Update pom.xml --- pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pom.xml b/pom.xml index f1830af6..9b9f8f49 100644 --- a/pom.xml +++ b/pom.xml @@ -102,11 +102,6 @@ slf4j-api 1.7.7 - - com.sun.java - tools - 11.0.1 - org.slf4j slf4j-simple From af3b9e5c9f4208d92b828488802e78f986c2d3c9 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 17 Jul 2020 08:48:36 +0530 Subject: [PATCH 108/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a4ab9848..f42abdc2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.10 +Sample Java Applicaiton V1.11 From ac6b314bc420533c027cb0cf4f50e2f9b6c83cb4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 17 Jul 2020 09:00:30 +0530 Subject: [PATCH 109/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f42abdc2..b2e5dfd6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.11 +Sample Java Applicaiton V1.11,n From 0f1948011cb6cd1cd13c925f2eea579b744e59e0 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Thu, 30 Jul 2020 18:33:28 +0530 Subject: [PATCH 110/269] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cb1ee3ba..d90f8e82 100644 --- a/pom.xml +++ b/pom.xml @@ -304,7 +304,7 @@ org.jacoco jacoco-maven-plugin - 0.7.2.201409121644 + 0.8.6-SNAPSHOT org.apache.maven.plugins From 92f4db6bdc480539102ee62c22ec3770d8dd1404 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 11 Aug 2020 18:40:28 +0530 Subject: [PATCH 111/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b2e5dfd6..f42abdc2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.11,n +Sample Java Applicaiton V1.11 From 071b9552615c89cb681451f35db6485900f78d78 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 14 Aug 2020 08:48:35 +0530 Subject: [PATCH 112/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f42abdc2..adf8aa7a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.11 +Sample Java Applicaiton V1.12 From 0b5741b3de9783a42806c86be7fddcf378d206bc Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 2 Sep 2020 20:47:33 +0530 Subject: [PATCH 113/269] Update GenericComparator.java --- src/main/java/com/devopsdemo/utilities/GenericComparator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/devopsdemo/utilities/GenericComparator.java b/src/main/java/com/devopsdemo/utilities/GenericComparator.java index 286cac56..84a03fb8 100644 --- a/src/main/java/com/devopsdemo/utilities/GenericComparator.java +++ b/src/main/java/com/devopsdemo/utilities/GenericComparator.java @@ -5,7 +5,7 @@ import java.util.Comparator; import java.util.Date; -/**** +/***** * Sorting - Generic Comparator * * @author Seshagiri Sriram From 2c1d2d78aa23ce4138339156ba15d10158ab0e30 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 3 Sep 2020 08:43:31 +0530 Subject: [PATCH 114/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 36f2a1bd..0bef678f 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -14,7 +14,7 @@ echo "No app service found" fi - name: deploy app - command: kubectl create deploy myapp --image=lerndevops/sampleapp:{{ build }} + command: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} - name: increase replicas command: kubectl scale deploy myapp --replicas=2 - name: deploy service From deda7651fff7e26667cfe1db1de29ac2e06553d2 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 3 Sep 2020 09:03:02 +0530 Subject: [PATCH 115/269] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index adf8aa7a..458f0614 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ -Sample Java Applicaiton V1.12 - +Sample Java Applicaiton V1.12kad From bb5019deb4ccd868a3e187d8554a6e7f419ffe71 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 3 Sep 2020 09:04:31 +0530 Subject: [PATCH 116/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 458f0614..f08cd3a9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ Sample Java Applicaiton V1.12kad +kajsdhf From 9be6adaacf2c82e236ad6a3eec523fa3cec32b99 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 13 Sep 2020 22:39:14 +0530 Subject: [PATCH 117/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f08cd3a9..79404ed2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Sample Java Applicaiton V1.12kad -kajsdhf +kajsdhfsdfas From 8fbe9b7d232d6c281d82423a75270269273e05ae Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 13 Sep 2020 23:00:48 +0530 Subject: [PATCH 118/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 79404ed2..7be16f27 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ Sample Java Applicaiton V1.12kad kajsdhfsdfas +asdfasd From 9ceeec016394d23abf552b91346d077129fc36b5 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 25 Sep 2020 22:22:12 +0530 Subject: [PATCH 119/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7be16f27..7a2592a0 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ Sample Java Applicaiton V1.12kad kajsdhfsdfas -asdfasd +asdfasdasdfas From 800852438f259b2c7ec7742d480b0718a10682b9 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 25 Sep 2020 22:28:53 +0530 Subject: [PATCH 120/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a2592a0..fa7cd638 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,4 @@ Sample Java Applicaiton V1.12kad kajsdhfsdfas -asdfasdasdfas +asdfasdasdfasasdfas From 97f7d1ffe18cf821ae5eafb8f3bfc9fa713f2643 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 7 Oct 2020 12:11:38 +0530 Subject: [PATCH 121/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa7cd638..0e7c0e4b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Sample Java Applicaiton V1.12kad +Sample Java Applicaiton V1.12kadsdfasdf kajsdhfsdfas asdfasdasdfasasdfas From 13cb08fc4af6a4693067024436cb881016f1feeb Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 7 Oct 2020 12:19:22 +0530 Subject: [PATCH 122/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0e7c0e4b..d1cd03b9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ Sample Java Applicaiton V1.12kadsdfasdf -kajsdhfsdfas +kajsdhfsdfassgsdfg asdfasdasdfasasdfas From 38602cfdded51f37bb0c0ec02f80d69c1405c3ca Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 7 Oct 2020 12:34:36 +0530 Subject: [PATCH 123/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index d1cd03b9..4cbb4c19 100644 --- a/README.md +++ b/README.md @@ -3,3 +3,4 @@ Sample Java Applicaiton V1.12kadsdfasdf kajsdhfsdfassgsdfg asdfasdasdfasasdfas +asdfasd From 15eb10d0640fc6b28a62f1314d3f1575e2448f42 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 11 Oct 2020 18:08:39 +0530 Subject: [PATCH 124/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4cbb4c19..286d9ddf 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Sample Java Applicaiton V1.12kadsdfasdf +Sample Java Applicaiton V1.12 kajsdhfsdfassgsdfg asdfasdasdfasasdfas From e936f8b1ce1565becaa89c95dfdb5fd3905eee0b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 11 Oct 2020 18:16:41 +0530 Subject: [PATCH 125/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 286d9ddf..dd894dd6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -Sample Java Applicaiton V1.12 +Sample Java Applicaiton V1.13 kajsdhfsdfassgsdfg asdfasdasdfasasdfas From cfcf513042b21f08abed6b3f43a30c27db74d28a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 13 Oct 2020 11:47:53 +0000 Subject: [PATCH 126/269] Bump junit from 4.7 to 4.13.1 Bumps [junit](https://github.com/junit-team/junit4) from 4.7 to 4.13.1. - [Release notes](https://github.com/junit-team/junit4/releases) - [Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.13.1.md) - [Commits](https://github.com/junit-team/junit4/compare/r4.7...r4.13.1) Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d90f8e82..55961b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ junit junit - 4.7 + 4.13.1 test From 03017bc43eb8a0759b461c441d3e4cbf4198c16a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:21:02 +0530 Subject: [PATCH 127/269] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index dd894dd6..ccd3f92a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,2 @@ Sample Java Applicaiton V1.13 - -kajsdhfsdfassgsdfg -asdfasdasdfasasdfas -asdfasd From 5e2d7d94a5d53f1c0742f24d34a2c8271ab268a7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 20 Oct 2020 07:29:53 +0530 Subject: [PATCH 128/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ccd3f92a..8cbde5b6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.13 +Sample Java Applicaiton V1.1 From 6642884bfdda6cee5b327695b4f7c1f8829979f8 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 20 Oct 2020 23:02:38 +0530 Subject: [PATCH 129/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 8cbde5b6..143a038e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ Sample Java Applicaiton V1.1 +adsfads From 965db878ad2ad8c46426d03f3387d3522bab5b48 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 20 Oct 2020 23:25:26 +0530 Subject: [PATCH 130/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 143a038e..30ea78b9 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ Sample Java Applicaiton V1.1 adsfads +dfgsfg From 1588659988f31e77ff1897882a2c27843064441b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 29 Oct 2020 22:15:48 +0530 Subject: [PATCH 131/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30ea78b9..f3d0b767 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ Sample Java Applicaiton V1.1 adsfads dfgsfg +asdf From 4808e09fb49d0eb96c0ca0a8ccb26511cd369b8c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 30 Oct 2020 20:43:03 +0530 Subject: [PATCH 132/269] Update README.md --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index f3d0b767..e499047e 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,3 @@ Sample Java Applicaiton V1.1 -adsfads -dfgsfg -asdf + From 70d02e3b897c095fcb76c896f5fb92feede11412 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 30 Oct 2020 21:26:30 +0530 Subject: [PATCH 133/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e499047e..96734530 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ Sample Java Applicaiton V1.1 +asdf From 68696e3572d2535ef22ee7836bcd4ba2db2223ee Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 1 Nov 2020 20:48:47 +0530 Subject: [PATCH 134/269] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 96734530..8cbde5b6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,2 @@ Sample Java Applicaiton V1.1 - -asdf From 12e0b9dec39977697f322630a757e529490a2408 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 1 Nov 2020 21:42:51 +0530 Subject: [PATCH 135/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cbde5b6..99a242f8 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.1 +Sample Java Applicaiton V1.1sdf From e09fa7f0d06be9b8864df5a1ec38c320511e2f61 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 1 Nov 2020 23:18:09 +0530 Subject: [PATCH 136/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99a242f8..015bd306 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.1sdf +Sample Java Applicaiton V1.1s From c52d05362ee5a254925d49b68b4257310e5b99a9 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 16 Nov 2020 07:48:48 +0530 Subject: [PATCH 137/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 015bd306..4d8de98b 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ Sample Java Applicaiton V1.1s +sdf From 94b9a74bef97b2b1bfdddc827cb4b36a5bfb9fbe Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 16 Nov 2020 07:55:53 +0530 Subject: [PATCH 138/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4d8de98b..9c65f436 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ Sample Java Applicaiton V1.1s sdf +asdf From 723f77d687cbfdd0e92238b8335a55d4009bc8e6 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 1 Dec 2020 09:39:25 +0530 Subject: [PATCH 139/269] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cd32c1b8..cf288dab 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { stage('codereview-pmd') { post { success { - pmd(canComputeNew: false, defaultEncoding: '', healthy: '', pattern: '**/pmd.xml', unHealthy: '') + recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') } } @@ -52,4 +52,4 @@ pipeline { } } -} \ No newline at end of file +} From 29751e262e11a5a055dc1667f31b4c0438069a7e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 4 Dec 2020 22:33:36 +0530 Subject: [PATCH 140/269] Update README.md --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 9c65f436..9ca18129 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,3 @@ Sample Java Applicaiton V1.1s -sdf -asdf + From b79fd10f56dc8e097f646e9079503857307ca0d3 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 4 Dec 2020 22:37:05 +0530 Subject: [PATCH 141/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9ca18129..a023454b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -Sample Java Applicaiton V1.1s +Sample Java Applicaiton V1.1s lksdfjsalkdf From 411b02799d38dad4a9178a8a7896b464f56a9f98 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 4 Dec 2020 22:40:25 +0530 Subject: [PATCH 142/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a023454b..19f6902a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ Sample Java Applicaiton V1.1s lksdfjsalkdf +asdfsdf From b4488d4ec2f90a4adf40b19bdd9d86e1d785af82 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 6 Dec 2020 09:28:09 +0530 Subject: [PATCH 143/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 19f6902a..7a8b7217 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ Sample Java Applicaiton V1.1s lksdfjsalkdf -asdfsdf + From 9aac74963cd3998ea8db0d1682f6de6eb813fae0 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 6 Dec 2020 09:31:46 +0530 Subject: [PATCH 144/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7a8b7217..5d51e21c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Sample Java Applicaiton V1.1s lksdfjsalkdf +Sample Java Applicaiton V1.1s From b6ed4ebf6764e8a7162d58a5d8fe2aa430582fda Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 6 Dec 2020 09:38:17 +0530 Subject: [PATCH 145/269] Update Jenkinsfile --- Jenkinsfile | 94 +++++++++++++++++++++++++---------------------------- 1 file changed, 45 insertions(+), 49 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cf288dab..6a9e95ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,55 +1,51 @@ pipeline { - agent any - stages { - stage('compile') { - steps { - git 'https://github.com/lerndevops/samplejavaapp.git' - sh '/opt/apache-maven-3.6.3/bin/mvn compile' - sleep 10 - } - } - - stage('codereview-pmd') { - post { - success { - recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') + agent any + stages { + stage('compile') { + steps { + echo 'compiling..' + git url: 'https://github.com/lerndevops/DevOpsClassCodes' + sh script: '/opt/apache-maven-3.6.3/bin/mvn compile' + } } - - } - steps { - sh '/opt/apache-maven-3.6.3/bin/mvn -P metrics pmd:pmd' - } - } - - stage('unit-test') { - post { - success { - junit 'target/surefire-reports/*.xml' + stage('codereview-pmd') { + steps { + echo 'codereview..' + sh script: '/opt/apache-maven-3.6.3/bin/mvn -P metrics pmd:pmd' + } + post { + success { + recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') + } + } } - - } - steps { - sh '/opt/apache-maven-3.6.3/bin/mvn test' - } - } - - stage('codecoverage') { - post { - success { - cobertura(autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false) + stage('unit-test') { + steps { + echo 'unittest..' + sh script: '/opt/apache-maven-3.6.3/bin/mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('codecoverate') { + steps { + echo 'codecoverage..' + sh script: '/opt/apache-maven-3.6.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + post { + success { + cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + } + } + } + stage('package') { + steps { + echo 'package..' + sh script: '/opt/apache-maven-3.6.3/bin/mvn package' + } } - - } - steps { - sh '/opt/apache-maven-3.6.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' - } - } - - stage('package') { - steps { - sh '/opt/apache-maven-3.6.3/bin/mvn clean package' - } } - - } } From 2a7f550ec1312de2f27de9384eb341cc7293e271 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 7 Dec 2020 20:44:13 +0530 Subject: [PATCH 146/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 5d51e21c..a979033d 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,4 @@ Sample Java Applicaiton V1.1s +adfasdf From 2324ede71cdd3022ab0fc6b1061312349a23dc91 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 22 Dec 2020 12:14:04 +0530 Subject: [PATCH 147/269] Update README.md --- README.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/README.md b/README.md index a979033d..8cbde5b6 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,2 @@ -Sample Java Applicaiton V1.1s - - -adfasdf +Sample Java Applicaiton V1.1 From c3d9984360d6781121284ea6bd0c2635d96d2261 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 30 Dec 2020 08:47:06 +0530 Subject: [PATCH 148/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8cbde5b6..2dafdb8e 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.1 +Sample Java Applicaiton V1.2 From 29fc6d544258bce54f0989e1e1f21ef70426fa66 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 30 Dec 2020 10:02:22 +0530 Subject: [PATCH 149/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2dafdb8e..70f3ebc9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.2 +Sample Java Applicaiton V1.3 From 8171e3800fbcd5d1bc054b44719c4079ca0e219e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 30 Dec 2020 10:09:55 +0530 Subject: [PATCH 150/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70f3ebc9..17769c41 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.3 +Sample Java Applicaiton V1.4 From 2a035fcb6cff70dcacfb9fbe3555ad4ed172b38e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 8 Jan 2021 10:42:02 +0530 Subject: [PATCH 151/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 17769c41..d3e2a7df 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.4 +Sample Java Applicaiton V1.5 From 9c86f36e47a2247743d36075df39224d552b07e2 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 10 Jan 2021 21:34:46 +0530 Subject: [PATCH 152/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3e2a7df..72929663 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.5 +Sample Java Applicaiton V1.6 From eed5e38563f90856eca40596717ed3b04623e936 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 24 Jan 2021 19:24:34 +0530 Subject: [PATCH 153/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 72929663..98f28b36 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.6 +Sample Java Applicaiton V1.7 From a33019815dc3cb3eaca8486349a2dfee278c4d91 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 24 Jan 2021 19:31:54 +0530 Subject: [PATCH 154/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98f28b36..d9027807 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.7 +Sample Java Applicaiton V1.8 From c5d21bcdc7d94e5ccad72930bcb42fbc0772de44 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 24 Jan 2021 21:05:56 +0530 Subject: [PATCH 155/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9027807..99ffe06d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V1.9 From 65b1d00bf310b7af56d44021e89680ebcfa93042 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 2 Feb 2021 15:26:31 +0530 Subject: [PATCH 156/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99ffe06d..d9027807 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.9 +Sample Java Applicaiton V1.8 From cecb808dcb5b8e93176da71df43d2b460eb97f00 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 2 Feb 2021 15:32:58 +0530 Subject: [PATCH 157/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9027807..98f28b36 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V1.7 From 471e41eb8428478db96fae9dc6a4ea9ef4d3056b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 7 Mar 2021 19:39:32 +0530 Subject: [PATCH 158/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98f28b36..d9027807 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.7 +Sample Java Applicaiton V1.8 From 03ef45cb91a000a99b2f50b44a9e7d74be1c25de Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 7 Mar 2021 20:49:27 +0530 Subject: [PATCH 159/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9027807..99ffe06d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V1.9 From 22b105754df6e9fe6b5a24b8f11fdd066e4271de Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 7 Mar 2021 20:56:15 +0530 Subject: [PATCH 160/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 99ffe06d..70f3ebc9 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.9 +Sample Java Applicaiton V1.3 From 54933d57b5ee669104f607432f715a344327d29e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 9 Mar 2021 09:05:43 +0530 Subject: [PATCH 161/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 70f3ebc9..d3e2a7df 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.3 +Sample Java Applicaiton V1.5 From b0b33e673d1ef438319b8d08a7b0d4afa9530431 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 10 Mar 2021 15:59:49 +0530 Subject: [PATCH 162/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d3e2a7df..d9027807 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.5 +Sample Java Applicaiton V1.8 From 631bdd340e5f082372aadf062a6e8d87a1cd9b6c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 22 Mar 2021 20:54:46 +0530 Subject: [PATCH 163/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9027807..0c9dffea 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V1.8 +Sample Java Applicaiton V2.0 From 39e8f7f6b9323267dc079e21eea4b3023ad91e88 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 31 Mar 2021 07:37:12 +0530 Subject: [PATCH 164/269] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eeaba822..c7c6e09c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ FROM tomcat -ADD target/sampleapp.war /usr/local/tomcat/webapps +COPY target/sampleapp.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run From d0d017533aec1c055fcfc257b2fe23509ccd6ab1 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 31 Mar 2021 07:44:29 +0530 Subject: [PATCH 165/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 0bef678f..36f2a1bd 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -14,7 +14,7 @@ echo "No app service found" fi - name: deploy app - command: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} + command: kubectl create deploy myapp --image=lerndevops/sampleapp:{{ build }} - name: increase replicas command: kubectl scale deploy myapp --replicas=2 - name: deploy service From 6ec69c978c625be7e14d89e9b33d6018ee6dce06 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 31 Mar 2021 08:30:54 +0530 Subject: [PATCH 166/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c9dffea..556541c2 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.1 From 4b2e996479e63d771a1392a8681c62a3807f71f2 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 26 Apr 2021 07:41:49 +0530 Subject: [PATCH 167/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 556541c2..0c9dffea 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.1 +Sample Java Applicaiton V2.0 From ef0806f478184c9ac8ef2615a3d966725c4c29ef Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 27 May 2021 17:31:51 +0530 Subject: [PATCH 168/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c9dffea..14bc1985 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.0 +Sample Java Applicaiton V2.2 From 91dd0e1a84adf9ef4adba6e9c94700acaa901150 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 5 Jun 2021 21:52:42 +0530 Subject: [PATCH 169/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14bc1985..8d927f15 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.2 +Sample Java Applicaiton V2.3 From f99787bd3147c098ee3cf46033b6bb292de0e139 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 11 Jun 2021 22:08:35 +0530 Subject: [PATCH 170/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8d927f15..b8560878 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.3 +Sample Java Applicaiton V2.5 From 192ee21caeb204b0287d2c4ea7c4555cd804e0e7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 30 Jun 2021 21:29:10 +0530 Subject: [PATCH 171/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 36f2a1bd..0bef678f 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -14,7 +14,7 @@ echo "No app service found" fi - name: deploy app - command: kubectl create deploy myapp --image=lerndevops/sampleapp:{{ build }} + command: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} - name: increase replicas command: kubectl scale deploy myapp --replicas=2 - name: deploy service From fc61a5932ed9bc3b535139b62b6fb47b0c83673a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 19 Jul 2021 20:57:12 +0530 Subject: [PATCH 172/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b8560878..21836efe 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.5 +Sample Java Applicaiton V2.6 From fdebfac97927260cac80f4531088e43c40ee38c0 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 19 Jul 2021 21:20:05 +0530 Subject: [PATCH 173/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 21836efe..8b09d81c 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ Sample Java Applicaiton V2.6 +hi From 00282d64835ef8fa87f177759cf91dfb52a61a8b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 20 Jul 2021 21:17:17 +0530 Subject: [PATCH 174/269] Update Jenkinsfile --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6a9e95ed..d884ea1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,13 +5,13 @@ pipeline { steps { echo 'compiling..' git url: 'https://github.com/lerndevops/DevOpsClassCodes' - sh script: '/opt/apache-maven-3.6.3/bin/mvn compile' + sh script: '/opt/apache-maven-3.8.1/bin/mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh script: '/opt/apache-maven-3.6.3/bin/mvn -P metrics pmd:pmd' + sh script: '/opt/apache-maven-3.8.1/bin/mvn -P metrics pmd:pmd' } post { success { @@ -22,7 +22,7 @@ pipeline { stage('unit-test') { steps { echo 'unittest..' - sh script: '/opt/apache-maven-3.6.3/bin/mvn test' + sh script: '/opt/apache-maven-3.8.1/bin/mvn test' } post { success { @@ -33,7 +33,7 @@ pipeline { stage('codecoverate') { steps { echo 'codecoverage..' - sh script: '/opt/apache-maven-3.6.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/apache-maven-3.8.1/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -44,7 +44,7 @@ pipeline { stage('package') { steps { echo 'package..' - sh script: '/opt/apache-maven-3.6.3/bin/mvn package' + sh script: '/opt/apache-maven-3.8.1/bin/mvn package' } } } From 056cd8ebbd41770629d31edb0424c644249f36f5 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 24 Jul 2021 21:03:46 +0530 Subject: [PATCH 175/269] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8b09d81c..21836efe 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ Sample Java Applicaiton V2.6 -hi From 41240ca5e8bdc80924e86c89c585c840c4a1b01d Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 24 Jul 2021 21:26:28 +0530 Subject: [PATCH 176/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 21836efe..28affb57 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.6 +Sample Java Applicaiton V2.7 From b79384253d885131e82f59dda1f8f596c5b7c721 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 24 Jul 2021 21:27:53 +0530 Subject: [PATCH 177/269] Update Dockerfile --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index c7c6e09c..f7a8d44f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,3 +2,4 @@ FROM tomcat COPY target/sampleapp.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run +# From 0792140d79808d4d7a4ff11e117369522a78c4d9 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 24 Jul 2021 21:29:40 +0530 Subject: [PATCH 178/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 28affb57..a6a57fe1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.7 +Sample Java Applicaiton V2.9 From 21d1e99a161cebb16997a3db4190e45da9ca0a0d Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 25 Jul 2021 19:23:53 +0530 Subject: [PATCH 179/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6a57fe1..9c3da563 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.9 +Sample Java Applicaiton V2.8 From 959b5bed078e2d31b9a9e4e00dd8f997a74d7be2 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 25 Jul 2021 19:27:29 +0530 Subject: [PATCH 180/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c3da563..a6a57fe1 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.8 +Sample Java Applicaiton V2.9 From cb1471cc0352c87fc0aa7c1f746978e8458299eb Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 4 Aug 2021 17:58:27 +0530 Subject: [PATCH 181/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 0bef678f..3972f5c0 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -14,8 +14,8 @@ echo "No app service found" fi - name: deploy app - command: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} + shell: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} - name: increase replicas - command: kubectl scale deploy myapp --replicas=2 + shell: kubectl scale deploy myapp --replicas=2 - name: deploy service - command: kubectl expose deploy myapp --name myapp-svc --port 8080 --type NodePort + shell: kubectl expose deploy myapp --name myapp-svc --port 8080 --type NodePort From 0ca2e838ac8314915d1f867d72e3b60cfffeb7d7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 20 Aug 2021 22:40:13 +0530 Subject: [PATCH 182/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6a57fe1..3370a4f7 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V2.9 +Sample Java Applicaiton V3.0 From f5c856645adaeff6c295b3b26adc1af405393e6c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 23 Aug 2021 22:28:41 +0530 Subject: [PATCH 183/269] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index d884ea1b..7f7d6f9b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { } stage('package') { steps { - echo 'package..' + echo 'package......' sh script: '/opt/apache-maven-3.8.1/bin/mvn package' } } From 191e014533d453a9c81c319fa41cba45761c79d7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 8 Sep 2021 21:59:03 +0530 Subject: [PATCH 184/269] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f7a8d44f..1e00740e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM tomcat +FROM tomcat:8.5.40 COPY target/sampleapp.war /usr/local/tomcat/webapps EXPOSE 8080 CMD /usr/local/tomcat/bin/catalina.sh run From 339fd0efcdac154818e269440b4b8b6867ce8bfb Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 17 Sep 2021 22:13:20 +0530 Subject: [PATCH 185/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3370a4f7..d9caa9ac 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.0 +Sample Java Applicaiton V3.1 From 9da97bc269cc21d57bab76b36cf1fc8ac5b1e2ab Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 17 Sep 2021 22:16:31 +0530 Subject: [PATCH 186/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d9caa9ac..9f2b8b8a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.1 +Sample Java Applicaiton V3.2 From ac06986c2c2d4d9dc10c6049a9d8d4c14d0da697 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 17 Sep 2021 22:24:29 +0530 Subject: [PATCH 187/269] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9f2b8b8a..9a199bea 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ Sample Java Applicaiton V3.2 +asd From c3e7c9845da355db36e7a797a82e4159563c4de4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 22 Oct 2021 21:21:58 +0530 Subject: [PATCH 188/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a199bea..e4f07ce2 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ -Sample Java Applicaiton V3.2 +Sample Java Applicaiton V3.3 asd From bdab587e687423e5a8b4b2628709478cca393ef7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 22 Oct 2021 21:34:33 +0530 Subject: [PATCH 189/269] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index e4f07ce2..1a4c5b47 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ Sample Java Applicaiton V3.3 -asd From 8251d4b9da1347f7e709c9cb40f9dbef8d5e79c3 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 25 Oct 2021 20:57:17 +0530 Subject: [PATCH 190/269] Update Jenkinsfile --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7f7d6f9b..7b2ab405 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,13 +5,13 @@ pipeline { steps { echo 'compiling..' git url: 'https://github.com/lerndevops/DevOpsClassCodes' - sh script: '/opt/apache-maven-3.8.1/bin/mvn compile' + sh script: '/opt/apache-maven-3.8.3/bin/mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh script: '/opt/apache-maven-3.8.1/bin/mvn -P metrics pmd:pmd' + sh script: '/opt/apache-maven-3.8.3/bin/mvn -P metrics pmd:pmd' } post { success { @@ -22,7 +22,7 @@ pipeline { stage('unit-test') { steps { echo 'unittest..' - sh script: '/opt/apache-maven-3.8.1/bin/mvn test' + sh script: '/opt/apache-maven-3.8.3/bin/mvn test' } post { success { @@ -33,7 +33,7 @@ pipeline { stage('codecoverate') { steps { echo 'codecoverage..' - sh script: '/opt/apache-maven-3.8.1/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/apache-maven-3.8.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -44,7 +44,7 @@ pipeline { stage('package') { steps { echo 'package......' - sh script: '/opt/apache-maven-3.8.1/bin/mvn package' + sh script: '/opt/apache-maven-3.8.3/bin/mvn package' } } } From 8af2f961cb3c9b0410bc256b96d225d7175936c2 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 23 Nov 2021 22:31:49 +0530 Subject: [PATCH 191/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 3972f5c0..afe4e51c 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -18,4 +18,4 @@ - name: increase replicas shell: kubectl scale deploy myapp --replicas=2 - name: deploy service - shell: kubectl expose deploy myapp --name myapp-svc --port 8080 --type NodePort + shell: kubectl expose deployment myapp --name myapp-svc --type NodePort --port 80 --target-port 8080 --node-port 30001 From 1688867a39bf749fd0fbbd138c52ee228a16a45f Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 23 Nov 2021 22:39:07 +0530 Subject: [PATCH 192/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index afe4e51c..c3a61249 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -18,4 +18,4 @@ - name: increase replicas shell: kubectl scale deploy myapp --replicas=2 - name: deploy service - shell: kubectl expose deployment myapp --name myapp-svc --type NodePort --port 80 --target-port 8080 --node-port 30001 + shell: kubectl expose deployment myapp --name myapp-svc --type NodePort --port 80 --target-port 8080 From 81d1e3c17a3911757bd7e5134c5b897207b91c87 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 20:41:39 +0530 Subject: [PATCH 193/269] Update Jenkinsfile --- Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7b2ab405..77c9a14b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,13 +5,13 @@ pipeline { steps { echo 'compiling..' git url: 'https://github.com/lerndevops/DevOpsClassCodes' - sh script: '/opt/apache-maven-3.8.3/bin/mvn compile' + sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh script: '/opt/apache-maven-3.8.3/bin/mvn -P metrics pmd:pmd' + sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' } post { success { @@ -22,7 +22,7 @@ pipeline { stage('unit-test') { steps { echo 'unittest..' - sh script: '/opt/apache-maven-3.8.3/bin/mvn test' + sh script: '/opt/apache-maven-3.8.4/bin/mvn test' } post { success { @@ -33,7 +33,7 @@ pipeline { stage('codecoverate') { steps { echo 'codecoverage..' - sh script: '/opt/apache-maven-3.8.3/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -44,7 +44,7 @@ pipeline { stage('package') { steps { echo 'package......' - sh script: '/opt/apache-maven-3.8.3/bin/mvn package' + sh script: '/opt/apache-maven-3.8.4/bin/mvn package' } } } From de3fd7aa500a2cb593de903fa2bd4a2c7b0c4e06 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 20:42:40 +0530 Subject: [PATCH 194/269] Create cicdjfile --- cicdjfile | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 cicdjfile diff --git a/cicdjfile b/cicdjfile new file mode 100644 index 00000000..77c9a14b --- /dev/null +++ b/cicdjfile @@ -0,0 +1,51 @@ +pipeline { + agent any + stages { + stage('compile') { + steps { + echo 'compiling..' + git url: 'https://github.com/lerndevops/DevOpsClassCodes' + sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + } + } + stage('codereview-pmd') { + steps { + echo 'codereview..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + } + post { + success { + recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') + } + } + } + stage('unit-test') { + steps { + echo 'unittest..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('codecoverate') { + steps { + echo 'codecoverage..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + post { + success { + cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + } + } + } + stage('package') { + steps { + echo 'package......' + sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + } + } + } +} From 2cb6ceb26afe2471c32e55758d8064b7f472d089 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 20:52:59 +0530 Subject: [PATCH 195/269] Update cicdjfile --- cicdjfile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/cicdjfile b/cicdjfile index 77c9a14b..e4f01008 100644 --- a/cicdjfile +++ b/cicdjfile @@ -47,5 +47,19 @@ pipeline { sh script: '/opt/apache-maven-3.8.4/bin/mvn package' } } + stage('build docker image') { + steps { + sh 'cd $WORKSPACE' + sh 'docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' + } + } + stage('push docker image') { + steps { + withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { + sh "docker login -u lerndevops -p ${DOCKER_HUB_PWD}" + } + sh 'docker push lerndevops/samplejavaapp:$BUILD_NUMBER' + } + } } } From d900ea198173954d52358fcf41a558253c4dd120 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:07:27 +0530 Subject: [PATCH 196/269] Update sampleapp-deploy-k8s.yml --- deploy/sampleapp-deploy-k8s.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/deploy/sampleapp-deploy-k8s.yml b/deploy/sampleapp-deploy-k8s.yml index 089311fd..724977a4 100755 --- a/deploy/sampleapp-deploy-k8s.yml +++ b/deploy/sampleapp-deploy-k8s.yml @@ -1,14 +1,14 @@ -apiVersion: apps/v1 kind: Deployment +apiVersion: apps/v1 metadata: - name: samplejavaapp + name: addressbook labels: - app: samplejavaapp + app: sampleapp spec: - replicas: 2 + replicas: 4 selector: matchLabels: - app: samplejavaapp + app: sampleapp template: metadata: labels: @@ -16,21 +16,21 @@ spec: spec: containers: - name: samplejavaapp - image: lerndevops/samplejavaapp + image: lerndevops/samplejavaapp:bno ports: - - containerPort: 8080 + - name: http + containerPort: 8080 --- - kind: Service apiVersion: v1 metadata: - name: samplejavaapp-svc + name: addressbook spec: type: NodePort selector: - app: samplejavaapp + app: sampleapp ports: - - protocol: TCP - port: 8080 + - port: 80 + targetPort: 8080 nodePort: 30002 From 70ddac9755627ed8a906e398820d2e8bc65e0fdb Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:23:27 +0530 Subject: [PATCH 197/269] Update cicdjfile --- cicdjfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/cicdjfile b/cicdjfile index e4f01008..7fb9dd2b 100644 --- a/cicdjfile +++ b/cicdjfile @@ -61,5 +61,10 @@ pipeline { sh 'docker push lerndevops/samplejavaapp:$BUILD_NUMBER' } } + stage('Deploy to K8s') { + steps { + sh 'sed -e 's/bno/'"$BUILD_NUMBER"'/g' sampleapp-deploy-k8s.yml' + sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' + } } } From 4f0645c4dca81ce09220ccdb274e5ba8075c1575 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:24:38 +0530 Subject: [PATCH 198/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 7fb9dd2b..8a3ea150 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -e 's/bno/'"$BUILD_NUMBER"'/g' sampleapp-deploy-k8s.yml' + sh "sed -e 's/bno/'"$BUILD_NUMBER"'/g' sampleapp-deploy-k8s.yml" sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } } From 5d906dd065a19cd8e23384b5ce177a18233e208e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:25:54 +0530 Subject: [PATCH 199/269] Update cicdjfile --- cicdjfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 8a3ea150..f6561cac 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,8 +63,9 @@ pipeline { } stage('Deploy to K8s') { steps { - sh "sed -e 's/bno/'"$BUILD_NUMBER"'/g' sampleapp-deploy-k8s.yml" + sh 'sed -e 's/bno/'"$BUILD_NUMBER"'/g' sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' + } } } } From 43f865d634569fa38b3ee031447ef1a0f6a816ec Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:27:16 +0530 Subject: [PATCH 200/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index f6561cac..0bcac6cc 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -e 's/bno/'"$BUILD_NUMBER"'/g' sampleapp-deploy-k8s.yml' + sh 'sed -i "s/bno/'"$BUILD_NUMBER"'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } } From 07374ad5e8d9bd08605b6a80809b5eb7e6bf9646 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:29:29 +0530 Subject: [PATCH 201/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 0bcac6cc..ad51b530 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -i "s/bno/'"$BUILD_NUMBER"'/g" deploy/sampleapp-deploy-k8s.yml' + sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } } From 101b4364b5962f515491af1e93f2e4f70f9a743a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:33:57 +0530 Subject: [PATCH 202/269] Update cicdjfile --- cicdjfile | 1 + 1 file changed, 1 insertion(+) diff --git a/cicdjfile b/cicdjfile index ad51b530..2536928f 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,6 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { + sh 'sed -e "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } From 239ad06e7ac3f1e076e1d9a61da72b371a0a5b15 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:37:28 +0530 Subject: [PATCH 203/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 2536928f..bcb7983d 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -e "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' + sh 'sed -e "s/bno/"$BUILD_NUMBER"/g" deploy/sampleapp-deploy-k8s.yml' sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } From 709d5a3a5c0c66252fe8ae0d3ccfe0b7df6f1145 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:39:07 +0530 Subject: [PATCH 204/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index bcb7983d..7063994c 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -e "s/bno/"$BUILD_NUMBER"/g" deploy/sampleapp-deploy-k8s.yml' + sh 'sed -e "'s/bno/"$BUILD_NUMBER"/g'" deploy/sampleapp-deploy-k8s.yml' sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } From 5df62d13eba2cccdf7c347c9268aed323af7114c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:41:18 +0530 Subject: [PATCH 205/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 7063994c..bcb7983d 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -e "'s/bno/"$BUILD_NUMBER"/g'" deploy/sampleapp-deploy-k8s.yml' + sh 'sed -e "s/bno/"$BUILD_NUMBER"/g" deploy/sampleapp-deploy-k8s.yml' sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } From 03958811475113cf7d96b061182d8cbed1d03568 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:45:52 +0530 Subject: [PATCH 206/269] Update cicdjfile --- cicdjfile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cicdjfile b/cicdjfile index bcb7983d..781bcc8e 100644 --- a/cicdjfile +++ b/cicdjfile @@ -66,7 +66,10 @@ pipeline { sh 'sed -e "s/bno/"$BUILD_NUMBER"/g" deploy/sampleapp-deploy-k8s.yml' sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' - } - } + } + post { + always { + cleanWs() } + } } } From fb32565d27a799763ff26cef4cac11fd677e96ca Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:46:42 +0530 Subject: [PATCH 207/269] Update cicdjfile --- cicdjfile | 1 - 1 file changed, 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 781bcc8e..299bc7c3 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,6 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -e "s/bno/"$BUILD_NUMBER"/g" deploy/sampleapp-deploy-k8s.yml' sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } From e063fdadfcaa1a3a6cb9b5496be63d67cda6b941 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:48:07 +0530 Subject: [PATCH 208/269] Update cicdjfile --- cicdjfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 299bc7c3..04826a53 100644 --- a/cicdjfile +++ b/cicdjfile @@ -68,7 +68,9 @@ pipeline { } post { always { - cleanWs() } + cleanWs() + } } + } } } From 1a453c8daadcad3d88eb7096f04d8c46441830ff Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:52:17 +0530 Subject: [PATCH 209/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 04826a53..6bafd453 100644 --- a/cicdjfile +++ b/cicdjfile @@ -4,7 +4,7 @@ pipeline { stage('compile') { steps { echo 'compiling..' - git url: 'https://github.com/lerndevops/DevOpsClassCodes' + git url: 'https://github.com/lerndevops/samplejavaapp' sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' } } From 955c85d4476e2dc56a63853a71d660c147c5180c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:55:22 +0530 Subject: [PATCH 210/269] Update sampleapp-deploy-k8s.yml --- deploy/sampleapp-deploy-k8s.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/sampleapp-deploy-k8s.yml b/deploy/sampleapp-deploy-k8s.yml index 724977a4..559061f9 100755 --- a/deploy/sampleapp-deploy-k8s.yml +++ b/deploy/sampleapp-deploy-k8s.yml @@ -12,7 +12,7 @@ spec: template: metadata: labels: - app: samplejavaapp + app: sampleapp spec: containers: - name: samplejavaapp @@ -25,7 +25,7 @@ spec: kind: Service apiVersion: v1 metadata: - name: addressbook + name: addressbook-svc spec: type: NodePort selector: From 1457e636e12ac9e66227393baecfa334cd63dfe7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 13 Jan 2022 21:57:12 +0530 Subject: [PATCH 211/269] Update cicdjfile --- cicdjfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cicdjfile b/cicdjfile index 6bafd453..ee59c952 100644 --- a/cicdjfile +++ b/cicdjfile @@ -63,7 +63,7 @@ pipeline { } stage('Deploy to K8s') { steps { - sh 'sed -i "s/bno/\'"$BUILD_NUMBER"\'/g" deploy/sampleapp-deploy-k8s.yml' + sh 'sed -i "s/bno/"$BUILD_NUMBER"/g" deploy/sampleapp-deploy-k8s.yml' sh 'kubectl apply -f deploy/sampleapp-deploy-k8s.yml' } post { From 38368f5f902eccec0f359f795168f065ca44ef54 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 16 Jan 2022 07:39:38 +0530 Subject: [PATCH 212/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a4c5b47..041f3319 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.3 +Sample Java Applicaiton V3.5 From f8b1050b88ab0cfbec5b296ae1bc2002c5435e91 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 16 Jan 2022 07:53:58 +0530 Subject: [PATCH 213/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 041f3319..b2c3f1c5 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.5 +Sample Java Applicaiton V3.4 From 1feca07bcc08af9e0e855d90579af48d2c1eb196 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 16 Jan 2022 09:14:16 +0530 Subject: [PATCH 214/269] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 77c9a14b..930cbcb0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('compile') { steps { echo 'compiling..' - git url: 'https://github.com/lerndevops/DevOpsClassCodes' + git url: 'https://github.com/lerndevops/samplejavaapp' sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' } } From 8e33c4598cdb0ce974793677147e1d62c3d3d1a4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 24 Jan 2022 07:21:44 +0530 Subject: [PATCH 215/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b2c3f1c5..041f3319 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.4 +Sample Java Applicaiton V3.5 From d0e813f2e48863b91f8c785490a445db047edc32 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 8 Feb 2022 22:09:26 +0530 Subject: [PATCH 216/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index c3a61249..322c9aa9 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -3,19 +3,20 @@ tasks: - name: remove any previous app services shell: | - if [ `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep myapp | wc -l` -gt 0 ]; then - kubectl delete deploy `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep myapp` + if [ `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep sampleapp | wc -l` -gt 0 ]; then + kubectl delete deploy `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep sampleapp` else echo "No app deployments found" fi - if [ `kubectl get svc | grep myapp-svc | awk '{print $1}' | wc -l` -gt 0 ]; then - kubectl delete svc `kubectl get svc | grep myapp-svc | awk '{print $1}'` + if [ `kubectl get svc | grep sampleapp | awk '{print $1}' | wc -l` -gt 0 ]; then + echo "app service found, No actions taken" + #kubectl delete svc `kubectl get svc | grep sampleapp | awk '{print $1}'` else - echo "No app service found" + echo "No app service found it will be created" fi - name: deploy app - shell: kubectl create deploy myapp --image=lerndevops/samplejavaapp:{{ build }} + shell: kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} - name: increase replicas - shell: kubectl scale deploy myapp --replicas=2 + shell: kubectl scale deploy sampleapp --replicas=2 - name: deploy service - shell: kubectl expose deployment myapp --name myapp-svc --type NodePort --port 80 --target-port 8080 + shell: kubectl expose deployment sampleapp --name sampleapp --type NodePort --port 80 --target-port 8080 From aa139aea7eae1af4712e52497c18cc35152096c4 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 8 Feb 2022 22:15:32 +0530 Subject: [PATCH 217/269] Update deploy-kube.yml --- deploy/deploy-kube.yml | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/deploy/deploy-kube.yml b/deploy/deploy-kube.yml index 322c9aa9..7377492c 100755 --- a/deploy/deploy-kube.yml +++ b/deploy/deploy-kube.yml @@ -1,22 +1,30 @@ - hosts: "{{ env }}" become: yes tasks: - - name: remove any previous app services + - name: Deploying Application pods... shell: | - if [ `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep sampleapp | wc -l` -gt 0 ]; then - kubectl delete deploy `kubectl get deploy | grep -v NAME | awk '{print $1}' | grep sampleapp` + if [ `kubectl get deployment | grep -v NAME | awk '{print $1}' | grep sampleapp | wc -l` -gt 0 ]; then + echo "deleteing previous application deployment" + kubectl delete deployment `kubectl get deployment | grep -v NAME | awk '{print $1}' | grep sampleapp` + echo "creating new application deployment" + kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} else - echo "No app deployments found" + echo "Deploying Sampleapp Application" + kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} fi + - name: deploying service + shell: | if [ `kubectl get svc | grep sampleapp | awk '{print $1}' | wc -l` -gt 0 ]; then echo "app service found, No actions taken" #kubectl delete svc `kubectl get svc | grep sampleapp | awk '{print $1}'` else - echo "No app service found it will be created" + echo "Creating App Services" + kubectl expose deployment sampleapp --name sampleapp --type NodePort --port 80 --target-port 8080 fi - - name: deploy app - shell: kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} - name: increase replicas shell: kubectl scale deploy sampleapp --replicas=2 - - name: deploy service - shell: kubectl expose deployment sampleapp --name sampleapp --type NodePort --port 80 --target-port 8080 + + #- name: deploy app + # shell: kubectl create deployment sampleapp --image=lerndevops/samplejavaapp:{{ build }} + #- name: deploy service + # shell: kubectl expose deployment sampleapp --name sampleapp --type NodePort --port 80 --target-port 8080 From 3fb1f8e6b88e0a5f61979d8b4ff74e13d711d904 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 8 Feb 2022 22:36:19 +0530 Subject: [PATCH 218/269] Create cicd-docker-ansible-kube --- cicd-docker-ansible-kube | 70 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 cicd-docker-ansible-kube diff --git a/cicd-docker-ansible-kube b/cicd-docker-ansible-kube new file mode 100644 index 00000000..57455344 --- /dev/null +++ b/cicd-docker-ansible-kube @@ -0,0 +1,70 @@ +pipeline { +agent any +stages { + stage('compile') { + steps { + echo 'compiling..' + git url: 'https://github.com/lerndevops/samplejavaapp' + sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + } + } + stage('codereview-pmd') { + steps { + echo 'codereview..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + } + post { + success { + recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') + } + } + } + stage('unit-test') { + steps { + echo 'unittest..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('codecoverage') { + steps { + echo 'codecoverage..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + post { + success { + cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + } + } + } + stage('package') { + steps { + echo 'package......' + sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + } + } + stage('build docker image') { + steps { + sh 'cd $WORKSPACE' + sh 'sudo docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' + } + } + stage('push docker image') { + steps { + withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { + sh "sudo docker login -u lerndevops -p ${DOCKER_HUB_PWD}" + } + sh 'sudo docker push lerndevops/samplejavaapp:$BUILD_NUMBER' + } + } + stage('Deploy-QA') { + steps { + sh 'sudo ansible-playbook --inventory /root/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + } + } +} +} From 1c4b1089b0103d50b5360822cd0fe284e83d655b Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 8 Feb 2022 22:40:11 +0530 Subject: [PATCH 219/269] Update cicd-docker-ansible-kube --- cicd-docker-ansible-kube | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/cicd-docker-ansible-kube b/cicd-docker-ansible-kube index 57455344..e29e4b4d 100644 --- a/cicd-docker-ansible-kube +++ b/cicd-docker-ansible-kube @@ -47,19 +47,15 @@ stages { sh script: '/opt/apache-maven-3.8.4/bin/mvn package' } } - stage('build docker image') { + stage('build & push docker image') { steps { sh 'cd $WORKSPACE' - sh 'sudo docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' - } - } - stage('push docker image') { - steps { - withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { - sh "sudo docker login -u lerndevops -p ${DOCKER_HUB_PWD}" - } - sh 'sudo docker push lerndevops/samplejavaapp:$BUILD_NUMBER' - } + sh 'sudo docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' + withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { + sh "sudo docker login -u lerndevops -p ${DOCKER_HUB_PWD}" + } + sh 'sudo docker push lerndevops/samplejavaapp:$BUILD_NUMBER' + } } stage('Deploy-QA') { steps { From 4900715473a9b2d8da6f7109ee41c9d2bfcfbc19 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 8 Feb 2022 22:51:32 +0530 Subject: [PATCH 220/269] Update and rename cicd-docker-ansible-kube to cicd-docker-ansible-kube.groovy --- cicd-docker-ansible-kube | 66 --------------------------------- cicd-docker-ansible-kube.groovy | 66 +++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 66 deletions(-) delete mode 100644 cicd-docker-ansible-kube create mode 100644 cicd-docker-ansible-kube.groovy diff --git a/cicd-docker-ansible-kube b/cicd-docker-ansible-kube deleted file mode 100644 index e29e4b4d..00000000 --- a/cicd-docker-ansible-kube +++ /dev/null @@ -1,66 +0,0 @@ -pipeline { -agent any -stages { - stage('compile') { - steps { - echo 'compiling..' - git url: 'https://github.com/lerndevops/samplejavaapp' - sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' - } - } - stage('codereview-pmd') { - steps { - echo 'codereview..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' - } - post { - success { - recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') - } - } - } - stage('unit-test') { - steps { - echo 'unittest..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn test' - } - post { - success { - junit 'target/surefire-reports/*.xml' - } - } - } - stage('codecoverage') { - steps { - echo 'codecoverage..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' - } - post { - success { - cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false - } - } - } - stage('package') { - steps { - echo 'package......' - sh script: '/opt/apache-maven-3.8.4/bin/mvn package' - } - } - stage('build & push docker image') { - steps { - sh 'cd $WORKSPACE' - sh 'sudo docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' - withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { - sh "sudo docker login -u lerndevops -p ${DOCKER_HUB_PWD}" - } - sh 'sudo docker push lerndevops/samplejavaapp:$BUILD_NUMBER' - } - } - stage('Deploy-QA') { - steps { - sh 'sudo ansible-playbook --inventory /root/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' - } - } -} -} diff --git a/cicd-docker-ansible-kube.groovy b/cicd-docker-ansible-kube.groovy new file mode 100644 index 00000000..6d9ad6a4 --- /dev/null +++ b/cicd-docker-ansible-kube.groovy @@ -0,0 +1,66 @@ +pipeline { +agent any +stages { + stage('compile') { + steps { + echo 'compiling..' + git url: 'https://github.com/lerndevops/samplejavaapp' + sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + } + } + stage('codereview-pmd') { + steps { + echo 'codereview..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + } + post { + success { + recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') + } + } + } + stage('unit-test') { + steps { + echo 'unittest..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('codecoverage') { + steps { + echo 'codecoverage..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + post { + success { + cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + } + } + } + stage('package/build-war') { + steps { + echo 'package......' + sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + } + } + stage('build & push docker image') { + steps { + sh 'cd $WORKSPACE' + sh 'sudo docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' + withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { + sh "sudo docker login -u lerndevops -p ${DOCKER_HUB_PWD}" + } + sh 'sudo docker push lerndevops/samplejavaapp:$BUILD_NUMBER' + } + } + stage('Deploy-QA') { + steps { + sh 'sudo ansible-playbook --inventory /root/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + } + } +} +} From f949364252d4dc46e8b399f1a7af732399e15a73 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Tue, 8 Feb 2022 22:55:36 +0530 Subject: [PATCH 221/269] Rename cicd-docker-ansible-kube.groovy to cicd-docker-ansible-kube.gvy --- cicd-docker-ansible-kube.groovy => cicd-docker-ansible-kube.gvy | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename cicd-docker-ansible-kube.groovy => cicd-docker-ansible-kube.gvy (100%) diff --git a/cicd-docker-ansible-kube.groovy b/cicd-docker-ansible-kube.gvy similarity index 100% rename from cicd-docker-ansible-kube.groovy rename to cicd-docker-ansible-kube.gvy From b513b5efc7088dcd003d31d07efda41ab7512b3a Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 9 Feb 2022 08:58:05 +0530 Subject: [PATCH 222/269] Create CICD.gvy --- CICD.gvy | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 CICD.gvy diff --git a/CICD.gvy b/CICD.gvy new file mode 100644 index 00000000..b7222986 --- /dev/null +++ b/CICD.gvy @@ -0,0 +1,75 @@ +pipeline { + agent any + stages { + stage('compile') { + steps { + // step1 + echo 'compiling..' + git url: 'https://github.com/lerndevops/samplejavaapp' + sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + } + } + stage('codereview-pmd') { + steps { + // step2 + echo 'codereview..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + } + post { + success { + recordIssues enabledForFailure: true, tool: pmdParser(pattern: '**/target/pmd.xml') + } + } + } + stage('unit-test') { + steps { + // step3 + echo 'unittest..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + } + post { + success { + junit 'target/surefire-reports/*.xml' + } + } + } + stage('codecoverage') { + + tools { + jdk 'java1.8' + } + steps { + // step4 + echo 'codecoverage..' + sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + } + post { + success { + cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + } + } + } + stage('package/build-war') { + steps { + // step5 + echo 'package......' + sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + } + } + stage('build & push docker image') { + steps { + withDockerRegistry(credentialsId: 'DOCKER_HUB_LOGIN', url: 'https://index.docker.io/v1/') { + sh script: 'cd $WORKSPACE' + sh script: 'docker build --file Dockerfile --tag docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER .' + sh script: 'docker push docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER' + } + } + } + stage('deploy-QA') { + steps { + sh script: 'cd $WORKSPACE/deploy' + sh script: 'sudo ansible-playbook --inventory /root/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + } + } + } +} From 59e7472b8ff40facc60107823f3e8b404e42f802 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 12 Feb 2022 23:33:41 +0530 Subject: [PATCH 223/269] Update CICD.gvy --- CICD.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CICD.gvy b/CICD.gvy index b7222986..4ec911c4 100644 --- a/CICD.gvy +++ b/CICD.gvy @@ -68,7 +68,7 @@ pipeline { stage('deploy-QA') { steps { sh script: 'cd $WORKSPACE/deploy' - sh script: 'sudo ansible-playbook --inventory /root/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + sh script: 'ansible-playbook --inventory /root/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' } } } From dc19b585cbab8b2dc5455a1cf2b84df8d63d7a89 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 12 Feb 2022 23:47:59 +0530 Subject: [PATCH 224/269] Update CICD.gvy --- CICD.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CICD.gvy b/CICD.gvy index 4ec911c4..b7222986 100644 --- a/CICD.gvy +++ b/CICD.gvy @@ -68,7 +68,7 @@ pipeline { stage('deploy-QA') { steps { sh script: 'cd $WORKSPACE/deploy' - sh script: 'ansible-playbook --inventory /root/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + sh script: 'sudo ansible-playbook --inventory /root/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' } } } From 58586ffb867dd94d495d558144eeebe2aa2cad0c Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 13 Feb 2022 09:48:37 +0530 Subject: [PATCH 225/269] Update CICD.gvy --- CICD.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CICD.gvy b/CICD.gvy index b7222986..ce88f38b 100644 --- a/CICD.gvy +++ b/CICD.gvy @@ -68,7 +68,7 @@ pipeline { stage('deploy-QA') { steps { sh script: 'cd $WORKSPACE/deploy' - sh script: 'sudo ansible-playbook --inventory /root/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + sh script: 'sudo ansible-playbook --inventory /tmp/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' } } } From fb80162eb12851d2cfb18659eccd8018efd8f35d Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 13 Feb 2022 09:52:50 +0530 Subject: [PATCH 226/269] Update CICD.gvy --- CICD.gvy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/CICD.gvy b/CICD.gvy index ce88f38b..e1d27bc8 100644 --- a/CICD.gvy +++ b/CICD.gvy @@ -67,8 +67,7 @@ pipeline { } stage('deploy-QA') { steps { - sh script: 'cd $WORKSPACE/deploy' - sh script: 'sudo ansible-playbook --inventory /tmp/myinv deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + sh script: 'sudo ansible-playbook --inventory /tmp/myinv $WORKSPACE/deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' } } } From 736a267f97437ca7076f44c731e945bc3c4b12ac Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Wed, 23 Feb 2022 21:14:11 +0530 Subject: [PATCH 227/269] Update and rename cicdjfile to cicd-docker-kube.gvy --- cicdjfile => cicd-docker-kube.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename cicdjfile => cicd-docker-kube.gvy (98%) diff --git a/cicdjfile b/cicd-docker-kube.gvy similarity index 98% rename from cicdjfile rename to cicd-docker-kube.gvy index ee59c952..093c98f0 100644 --- a/cicdjfile +++ b/cicd-docker-kube.gvy @@ -30,7 +30,7 @@ pipeline { } } } - stage('codecoverate') { + stage('codecoverage') { steps { echo 'codecoverage..' sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' From 8350fd6eb6bd23a86e866110e8e6e37fd5c1fe31 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Thu, 24 Feb 2022 17:31:05 +0530 Subject: [PATCH 228/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 041f3319..1a4c5b47 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.5 +Sample Java Applicaiton V3.3 From 2293069fbece024311702e39f2fdb40b0e97a0d7 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 25 Feb 2022 07:56:44 +0530 Subject: [PATCH 229/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1a4c5b47..041f3319 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.3 +Sample Java Applicaiton V3.5 From 84255939c9cb197734219e7446b5a20ed8a7cfe8 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 26 Feb 2022 20:55:59 +0530 Subject: [PATCH 230/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 041f3319..a7754d3f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.5 +Sample Java Applicaiton V3.6 From 791f7defba6049a9d3ea7dfbc445911b9c7abd06 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 26 Feb 2022 21:00:09 +0530 Subject: [PATCH 231/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7754d3f..041f3319 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.6 +Sample Java Applicaiton V3.5 From f0932393c12cec0b06a11ce91ee1264dddfa642e Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sat, 26 Feb 2022 21:22:07 +0530 Subject: [PATCH 232/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 041f3319..a7754d3f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.5 +Sample Java Applicaiton V3.6 From 454b48bde07869ebb2e8dbc7f8464da5f9262820 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:10:02 +0530 Subject: [PATCH 233/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7754d3f..041f3319 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.6 +Sample Java Applicaiton V3.5 From 2e190da0ba94b642d2243ca32b691f0e2290bfb8 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Sun, 27 Feb 2022 19:13:37 +0530 Subject: [PATCH 234/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 041f3319..a7754d3f 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.5 +Sample Java Applicaiton V3.6 From 444847de84846bfbbbb9bca697d99895f188b385 Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Fri, 4 Mar 2022 21:59:02 +0530 Subject: [PATCH 235/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a7754d3f..9f2b8b8a 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ -Sample Java Applicaiton V3.6 +Sample Java Applicaiton V3.2 From aac39a2a2062f2bb19281e564b45b8132bbffdbf Mon Sep 17 00:00:00 2001 From: lerndevops <45846027+lerndevops@users.noreply.github.com> Date: Mon, 11 Apr 2022 17:38:47 +0530 Subject: [PATCH 236/269] Update pom.xml --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 55961b3b..6dc5fac9 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,13 @@ + + + internal.repo + Internal repo + file:///var/lib/jenkins/deploy/ + + From 29c5c420c849f02083dbf0b8ddee51b0bea5f609 Mon Sep 17 00:00:00 2001 From: nareshwart Date: Fri, 22 Apr 2022 00:23:21 +0530 Subject: [PATCH 237/269] readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f2b8b8a..49b159b0 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,2 @@ - +h Sample Java Applicaiton V3.2 From 86bf387f26e10c0cedbc29d6d67d73891078e223 Mon Sep 17 00:00:00 2001 From: nareshwart Date: Fri, 22 Apr 2022 07:38:46 +0530 Subject: [PATCH 238/269] read --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 49b159b0..6aeb2071 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ -h Sample Java Applicaiton V3.2 From 1562e596a41b8c66638754d2a45708554dc76e64 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 3 Jun 2022 19:01:39 +0530 Subject: [PATCH 239/269] Update build.gradle --- build.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 6a4af0f8..14a47122 100644 --- a/build.gradle +++ b/build.gradle @@ -4,6 +4,7 @@ plugins { id 'java' + id 'war' id 'maven-publish' } @@ -14,11 +15,11 @@ repositories { } maven { - url = 'http://maven.vaadin.com/vaadin-addons' + url = 'https://maven.vaadin.com/vaadin-addons' } maven { - url = 'http://oss.sonatype.org/content/repositories/vaadin-snapshots/' + url = 'https://oss.sonatype.org/content/repositories/vaadin-snapshots/' } maven { From d67a3e57db0f0b1ea1e91b25215fd094799d3d44 Mon Sep 17 00:00:00 2001 From: leaddevops Date: Fri, 3 Jun 2022 19:10:02 +0530 Subject: [PATCH 240/269] gradle --- gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 0 bytes gradle/wrapper/gradle-wrapper.properties | 5 - gradlew | 183 ------------------ gradlew.bat | 100 ---------- CICD.gvy => jenkins/CICD.gvy | 10 +- Jenkinsfile => jenkins/Jenkinsfile-CI | 10 +- .../cicd-docker-ansible-kube.gvy | 10 +- .../cicd-docker-kube.gvy | 12 +- .../jenkinsfile-k8s.gvy | 2 +- .../jenkinsfile-win.gvy | 0 10 files changed, 22 insertions(+), 310 deletions(-) delete mode 100644 gradle/wrapper/gradle-wrapper.jar delete mode 100644 gradle/wrapper/gradle-wrapper.properties delete mode 100755 gradlew delete mode 100644 gradlew.bat rename CICD.gvy => jenkins/CICD.gvy (85%) rename Jenkinsfile => jenkins/Jenkinsfile-CI (80%) rename cicd-docker-ansible-kube.gvy => jenkins/cicd-docker-ansible-kube.gvy (83%) rename cicd-docker-kube.gvy => jenkins/cicd-docker-kube.gvy (86%) rename jenkinsfile-k8s => jenkins/jenkinsfile-k8s.gvy (93%) rename jenkinsfile-win => jenkins/jenkinsfile-win.gvy (100%) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar deleted file mode 100644 index f3d88b1c2faf2fc91d853cd5d4242b5547257070..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 58695 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index 1b16c34a..00000000 --- a/gradle/wrapper/gradle-wrapper.properties +++ /dev/null @@ -1,5 +0,0 @@ -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew deleted file mode 100755 index 2fe81a7d..00000000 --- a/gradlew +++ /dev/null @@ -1,183 +0,0 @@ -#!/usr/bin/env sh - -# -# Copyright 2015 the original author or authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn () { - echo "$*" -} - -die () { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=`expr $i + 1` - done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index 24467a14..00000000 --- a/gradlew.bat +++ /dev/null @@ -1,100 +0,0 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/CICD.gvy b/jenkins/CICD.gvy similarity index 85% rename from CICD.gvy rename to jenkins/CICD.gvy index e1d27bc8..9147a5a3 100644 --- a/CICD.gvy +++ b/jenkins/CICD.gvy @@ -6,14 +6,14 @@ pipeline { // step1 echo 'compiling..' git url: 'https://github.com/lerndevops/samplejavaapp' - sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + sh script: '/opt/maven/bin/mvn compile' } } stage('codereview-pmd') { steps { // step2 echo 'codereview..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + sh script: '/opt/maven/bin/mvn -P metrics pmd:pmd' } post { success { @@ -25,7 +25,7 @@ pipeline { steps { // step3 echo 'unittest..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + sh script: '/opt/maven/bin/mvn test' } post { success { @@ -41,7 +41,7 @@ pipeline { steps { // step4 echo 'codecoverage..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/maven/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -53,7 +53,7 @@ pipeline { steps { // step5 echo 'package......' - sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + sh script: '/opt/maven/bin/mvn package' } } stage('build & push docker image') { diff --git a/Jenkinsfile b/jenkins/Jenkinsfile-CI similarity index 80% rename from Jenkinsfile rename to jenkins/Jenkinsfile-CI index 930cbcb0..9fa0a922 100644 --- a/Jenkinsfile +++ b/jenkins/Jenkinsfile-CI @@ -5,13 +5,13 @@ pipeline { steps { echo 'compiling..' git url: 'https://github.com/lerndevops/samplejavaapp' - sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + sh script: '/opt/maven/bin/mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + sh script: '/opt/maven/bin/mvn -P metrics pmd:pmd' } post { success { @@ -22,7 +22,7 @@ pipeline { stage('unit-test') { steps { echo 'unittest..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + sh script: '/opt/maven/bin/mvn test' } post { success { @@ -33,7 +33,7 @@ pipeline { stage('codecoverate') { steps { echo 'codecoverage..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/maven/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -44,7 +44,7 @@ pipeline { stage('package') { steps { echo 'package......' - sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + sh script: '/opt/maven/bin/mvn package' } } } diff --git a/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy similarity index 83% rename from cicd-docker-ansible-kube.gvy rename to jenkins/cicd-docker-ansible-kube.gvy index 6d9ad6a4..c7aa85d1 100644 --- a/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -5,13 +5,13 @@ stages { steps { echo 'compiling..' git url: 'https://github.com/lerndevops/samplejavaapp' - sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + sh script: '/opt/maven/bin/mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + sh script: '/opt/maven/bin/mvn -P metrics pmd:pmd' } post { success { @@ -22,7 +22,7 @@ stages { stage('unit-test') { steps { echo 'unittest..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + sh script: '/opt/maven/bin/mvn test' } post { success { @@ -33,7 +33,7 @@ stages { stage('codecoverage') { steps { echo 'codecoverage..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/maven/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -44,7 +44,7 @@ stages { stage('package/build-war') { steps { echo 'package......' - sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + sh script: '/opt/maven/bin/mvn package' } } stage('build & push docker image') { diff --git a/cicd-docker-kube.gvy b/jenkins/cicd-docker-kube.gvy similarity index 86% rename from cicd-docker-kube.gvy rename to jenkins/cicd-docker-kube.gvy index 093c98f0..e97afe03 100644 --- a/cicd-docker-kube.gvy +++ b/jenkins/cicd-docker-kube.gvy @@ -5,13 +5,13 @@ pipeline { steps { echo 'compiling..' git url: 'https://github.com/lerndevops/samplejavaapp' - sh script: '/opt/apache-maven-3.8.4/bin/mvn compile' + sh script: '/opt/maven/bin/mvn compile' } } stage('codereview-pmd') { steps { echo 'codereview..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn -P metrics pmd:pmd' + sh script: '/opt/maven/bin/mvn -P metrics pmd:pmd' } post { success { @@ -22,7 +22,7 @@ pipeline { stage('unit-test') { steps { echo 'unittest..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn test' + sh script: '/opt/maven/bin/mvn test' } post { success { @@ -33,7 +33,7 @@ pipeline { stage('codecoverage') { steps { echo 'codecoverage..' - sh script: '/opt/apache-maven-3.8.4/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/maven/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' } post { success { @@ -44,7 +44,7 @@ pipeline { stage('package') { steps { echo 'package......' - sh script: '/opt/apache-maven-3.8.4/bin/mvn package' + sh script: '/opt/maven/bin/mvn package' } } stage('build docker image') { @@ -73,4 +73,4 @@ pipeline { } } } -} + diff --git a/jenkinsfile-k8s b/jenkins/jenkinsfile-k8s.gvy similarity index 93% rename from jenkinsfile-k8s rename to jenkins/jenkinsfile-k8s.gvy index c58f0d64..21c0837c 100644 --- a/jenkinsfile-k8s +++ b/jenkins/jenkinsfile-k8s.gvy @@ -8,7 +8,7 @@ pipeline { } stage('build artifact') { steps { - sh '/opt/apache-maven-3.6.2/bin/mvn clean package' + sh '/opt/maven/bin/mvn clean package' } } stage('build docker image') { diff --git a/jenkinsfile-win b/jenkins/jenkinsfile-win.gvy similarity index 100% rename from jenkinsfile-win rename to jenkins/jenkinsfile-win.gvy From f3ca65ff52f05c43538f1a146739204041f84935 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Mon, 6 Jun 2022 21:50:25 +0530 Subject: [PATCH 241/269] Update CaseInsensitiveComparator.java --- .../com/devopsdemo/utilities/CaseInsensitiveComparator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java b/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java index 4c80de6c..27ca2c2d 100644 --- a/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java +++ b/src/main/java/com/devopsdemo/utilities/CaseInsensitiveComparator.java @@ -12,7 +12,7 @@ public class CaseInsensitiveComparator extends GenericComparator { private static final Logger LOG =LoggerFactory.getLogger(CaseInsensitiveComparator.class); /* - * This function call base GenericComparator(boolean sortAscending) class and set whether sorting is in ascending or descending + * This functiona call base GenericComparator(boolean sortAscending) class and set whether sorting is in ascending or descending * sortAscending = true then ascending * sortAscending = false then descending */ From 02f0800649521dd3e3f5082ee8faf4ea30a6412f Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Mon, 18 Jul 2022 08:11:17 +0530 Subject: [PATCH 242/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6aeb2071..48ef4f93 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.2 +Sample Java Applicaiton V3.3 From bbcb93da114a61846d3b03b90a5c1d3fa381ea44 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Mon, 29 Aug 2022 22:06:10 +0530 Subject: [PATCH 243/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 48ef4f93..29b681c2 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.3 +Sample Java Applicaiton V3.8 From 9b91629e6e4ab1279261c801fa4bc788d07adda4 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Mon, 29 Aug 2022 22:10:46 +0530 Subject: [PATCH 244/269] Update HexAsciiConvertor.java --- src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java b/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java index d7164e8f..a69234aa 100644 --- a/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java +++ b/src/main/java/com/devopsdemo/utilities/HexAsciiConvertor.java @@ -1,7 +1,7 @@ package com.devopsdemo.utilities; public class HexAsciiConvertor { - /** + /*** * Method to convert hexadecimal values into ascii * method is return the ascii value * @param hexValue @@ -56,4 +56,4 @@ public static String convertAsciiToHex(String asciiValue) } return hexvalue; } -} \ No newline at end of file +} From 0aea643725546592494f7d1233b1075f33e5c4d3 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 9 Sep 2022 14:16:49 +0530 Subject: [PATCH 245/269] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index c7aa85d1..c8b9f7f9 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -30,17 +30,6 @@ stages { } } } - stage('codecoverage') { - steps { - echo 'codecoverage..' - sh script: '/opt/maven/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' - } - post { - success { - cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false - } - } - } stage('package/build-war') { steps { echo 'package......' From f79a184a4ae0254e34916cc6c09a3e9655eb3471 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 9 Sep 2022 14:21:01 +0530 Subject: [PATCH 246/269] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index c8b9f7f9..544f0715 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -39,16 +39,16 @@ stages { stage('build & push docker image') { steps { sh 'cd $WORKSPACE' - sh 'sudo docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' + sh 'docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { - sh "sudo docker login -u lerndevops -p ${DOCKER_HUB_PWD}" + sh "docker login -u lerndevops -p ${DOCKER_HUB_PWD}" } - sh 'sudo docker push lerndevops/samplejavaapp:$BUILD_NUMBER' + sh 'docker push lerndevops/samplejavaapp:$BUILD_NUMBER' } } stage('Deploy-QA') { steps { - sh 'sudo ansible-playbook --inventory /root/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + sh 'ansible-playbook --inventory /root/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' } } } From f73561a93bd53b6e93f686b1366cae5df4a73cca Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 9 Sep 2022 17:44:35 +0530 Subject: [PATCH 247/269] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index 544f0715..12a7ce4e 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -48,7 +48,7 @@ stages { } stage('Deploy-QA') { steps { - sh 'ansible-playbook --inventory /root/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' + sh 'ansible-playbook --inventory /tmp/myinv deploy/deploy-kube.yml --extra-vars "env=qa build=$BUILD_NUMBER"' } } } From 212e55d3c7a6c8bce0e22ff000828d709fc77d02 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 09:34:57 +0530 Subject: [PATCH 248/269] Update pom.xml --- pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6dc5fac9..5dac3209 100644 --- a/pom.xml +++ b/pom.xml @@ -163,7 +163,13 @@ - + + + tools + com.sun + + + From a114976072598b74307dc367895bc95a26d48c4e Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 09:36:43 +0530 Subject: [PATCH 249/269] Update pom.xml --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 5dac3209..95245414 100644 --- a/pom.xml +++ b/pom.xml @@ -160,15 +160,14 @@ xml-security-impl 1.0 - - - tools com.sun + + From ba5c7ba251d3ce0d0c0fed7bde1eef83b2c31c37 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 09:39:00 +0530 Subject: [PATCH 250/269] Update pom.xml --- pom.xml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 95245414..1b665f42 100644 --- a/pom.xml +++ b/pom.xml @@ -159,14 +159,13 @@ com.sun.xml.security xml-security-impl 1.0 + + + tools + com.sun + + - - - tools - com.sun - - - From d92e34fd1c530b39313571cf43e19b6e338477c3 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 09:53:19 +0530 Subject: [PATCH 251/269] Update pom.xml --- pom.xml | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 1b665f42..d0dd7ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -159,12 +159,6 @@ com.sun.xml.security xml-security-impl 1.0 - - - tools - com.sun - - @@ -312,11 +306,29 @@ maven-project-info-reports-plugin 2.7 - - org.jacoco - jacoco-maven-plugin - 0.8.6-SNAPSHOT - + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + jacoco-report + test + + report + + + + target/jacoco-report + + + + org.apache.maven.plugins maven-checkstyle-plugin From 1f06a45eeb012cd7fa18fa300b329e7c5339d069 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:03:38 +0530 Subject: [PATCH 252/269] Update pom.xml --- pom.xml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index d0dd7ca9..5e6d53c9 100644 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,30 @@ maven-surefire-report-plugin 2.19.1 - + + org.jacoco + jacoco-maven-plugin + ${jacoco.version} + + + + prepare-agent + + + + jacoco-report + test + + report + + + + target/jacoco-report + + + + + @@ -306,29 +329,6 @@ maven-project-info-reports-plugin 2.7 - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - jacoco-report - test - - report - - - - target/jacoco-report - - - - org.apache.maven.plugins maven-checkstyle-plugin From 22e187ba7a9b28aa44ab4b69c1d9f8be3e7d9089 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:06:05 +0530 Subject: [PATCH 253/269] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 5e6d53c9..a499e9ba 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ false 8.0.0.alpha2 ${vaadin.version} + 0.8.2 From bd4c42c6778613d2d9769ad2250413e47addd105 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:10:30 +0530 Subject: [PATCH 254/269] Update pom.xml --- pom.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a499e9ba..83ef2d9c 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ false 8.0.0.alpha2 ${vaadin.version} - 0.8.2 + 0.8.6 @@ -354,6 +354,11 @@ true + + org.jacoco + jacoco-maven-plugin + 0.8.6 + org.codehaus.mojo findbugs-maven-plugin From d8c0f23f5deb87878e5a8204b21a2aa4b4214e03 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 10:16:24 +0530 Subject: [PATCH 255/269] Update pom.xml --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 83ef2d9c..2ce8446a 100644 --- a/pom.xml +++ b/pom.xml @@ -210,10 +210,10 @@ maven-surefire-report-plugin 2.19.1 - + org.jacoco jacoco-maven-plugin - ${jacoco.version} + 0.8.6 @@ -232,8 +232,8 @@ - - + + From ac7ec96cec16d91dc8c6d6d8d645ce64bb20d521 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:01:03 +0530 Subject: [PATCH 256/269] Update pom.xml --- pom.xml | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/pom.xml b/pom.xml index 2ce8446a..00318e02 100644 --- a/pom.xml +++ b/pom.xml @@ -210,29 +210,6 @@ maven-surefire-report-plugin 2.19.1 - - org.jacoco - jacoco-maven-plugin - 0.8.6 - - - - prepare-agent - - - - jacoco-report - test - - report - - - - target/jacoco-report - - - - @@ -357,7 +334,7 @@ org.jacoco jacoco-maven-plugin - 0.8.6 + 0.8.2 org.codehaus.mojo From ea57b162766c4f9247a5b401b26ca62997220ffc Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 18:08:29 +0530 Subject: [PATCH 257/269] Update pom.xml --- pom.xml | 142 +++++++++++++++++++++++++++----------------------------- 1 file changed, 68 insertions(+), 74 deletions(-) diff --git a/pom.xml b/pom.xml index 00318e02..9bff751a 100644 --- a/pom.xml +++ b/pom.xml @@ -200,9 +200,7 @@ sampleapp - - - + @@ -210,6 +208,73 @@ maven-surefire-report-plugin 2.19.1 + + maven-project-info-reports-plugin + 2.7 + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.0.1 + + + + + + org.apache.maven.plugins + maven-pmd-plugin + 3.2 + + 1.8 + true + xml + + /pmd-rules.xml + + + 20 + true + + + + org.jacoco + jacoco-maven-plugin + 0.8.2 + + + org.codehaus.mojo + findbugs-maven-plugin + 2.4.0 + + Max + true + + + + maven-javadoc-plugin + 2.9.1 + + 1.8 + + gr.spinellis.umlgraph.doclet.UmlGraphDoc + + + gr.spinellis + UmlGraph + 4.6 + + + -inferrel -inferdep -hide java.* -collpackages + java.util.* -attributes -operations + -enumerations -enumconstants + + + + + org.apache.maven.plugins + maven-jxr-plugin + 2.4 + @@ -301,77 +366,6 @@ org.apache.maven.plugins maven-site-plugin 3.3 - - - - maven-project-info-reports-plugin - 2.7 - - - org.apache.maven.plugins - maven-checkstyle-plugin - 3.0.1 - - - - - - org.apache.maven.plugins - maven-pmd-plugin - 3.2 - - 1.8 - true - xml - - /pmd-rules.xml - - - 20 - true - - - - org.jacoco - jacoco-maven-plugin - 0.8.2 - - - org.codehaus.mojo - findbugs-maven-plugin - 2.4.0 - - Max - true - - - - maven-javadoc-plugin - 2.9.1 - - 1.8 - - gr.spinellis.umlgraph.doclet.UmlGraphDoc - - - gr.spinellis - UmlGraph - 4.6 - - - -inferrel -inferdep -hide java.* -collpackages - java.util.* -attributes -operations - -enumerations -enumconstants - - - - - org.apache.maven.plugins - maven-jxr-plugin - 2.4 - - - com.devopsdemo.tutorial From cdb1d073c24fac5611018ca92f6bec927f38ee28 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:21:37 +0530 Subject: [PATCH 258/269] Update pom.xml --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index 9bff751a..55612909 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,20 @@ org.jacoco jacoco-maven-plugin 0.8.2 + + + + prepare-agent + + + + report + test + + report + + + org.codehaus.mojo From 2e262593a51299a0f02f4f44cb39c0ad21d8ba4e Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:25:36 +0530 Subject: [PATCH 259/269] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 55612909..7ec07aa6 100644 --- a/pom.xml +++ b/pom.xml @@ -240,6 +240,7 @@ org.jacoco jacoco-maven-plugin 0.8.2 + true From 8c33dd81b84b82f5e1f2485a0da66b39b48fb2a0 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:33:07 +0530 Subject: [PATCH 260/269] Update pom.xml --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 7ec07aa6..60e3c36d 100644 --- a/pom.xml +++ b/pom.xml @@ -28,12 +28,11 @@ vaadin-addons http://maven.vaadin.com/vaadin-addons - vaadin-snapshots http://oss.sonatype.org/content/repositories/vaadin-snapshots/ - false + true true From 19f6ff835d922899f1fcb1806eb90e41fe214392 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:46:02 +0530 Subject: [PATCH 261/269] Update pom.xml --- pom.xml | 78 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/pom.xml b/pom.xml index 60e3c36d..efe7fc0d 100644 --- a/pom.xml +++ b/pom.xml @@ -177,26 +177,44 @@ org.eclipse.jetty jetty-maven-plugin 9.2.3.v20140905 - - - - org.apache.maven.plugins - maven-surefire-plugin - 2.19.1 - - methods - 10 - - **/Test*.java - **/Test.java - **/TestCase.java - - - **/*Abstract*Test.java - - - - + + + org.apache.maven.plugins + maven-surefire-plugin + 2.19.1 + + methods + 10 + + **/Test*.java + **/Test.java + **/TestCase.java + + + **/*Abstract*Test.java + + + + + org.jacoco + jacoco-maven-plugin + 0.8.6 + true + + + + prepare-agent + + + + report + test + + report + + + + sampleapp @@ -235,26 +253,6 @@ true - - org.jacoco - jacoco-maven-plugin - 0.8.2 - true - - - - prepare-agent - - - - report - test - - report - - - - org.codehaus.mojo findbugs-maven-plugin From c8f34031582873b81ada106c3e76cf8b667364bc Mon Sep 17 00:00:00 2001 From: saiharshitach <96222425+saiharshitach@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:16:17 +0530 Subject: [PATCH 262/269] Update Jenkinsfile-CI --- jenkins/Jenkinsfile-CI | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jenkins/Jenkinsfile-CI b/jenkins/Jenkinsfile-CI index 9fa0a922..43a745d6 100644 --- a/jenkins/Jenkinsfile-CI +++ b/jenkins/Jenkinsfile-CI @@ -30,14 +30,14 @@ pipeline { } } } - stage('codecoverate') { + stage('codecoverage') { steps { echo 'codecoverage..' - sh script: '/opt/maven/bin/mvn cobertura:cobertura -Dcobertura.report.format=xml' + sh script: '/opt/maven/bin/mvn test' } post { success { - cobertura autoUpdateHealth: false, autoUpdateStability: false, coberturaReportFile: 'target/site/cobertura/coverage.xml', conditionalCoverageTargets: '70, 0, 0', failUnhealthy: false, failUnstable: false, lineCoverageTargets: '80, 0, 0', maxNumberOfBuilds: 0, methodCoverageTargets: '80, 0, 0', onlyStable: false, sourceEncoding: 'ASCII', zoomCoverageChart: false + jacoco changeBuildStatus: true, maximumBranchCoverage: '10', maximumClassCoverage: '10', maximumComplexityCoverage: '10', maximumInstructionCoverage: '10', maximumLineCoverage: '10', maximumMethodCoverage: '10' } } } From 418bd2d482b63c78eec5810644e08ac90e9a0d81 Mon Sep 17 00:00:00 2001 From: saiharshitach <96222425+saiharshitach@users.noreply.github.com> Date: Sun, 2 Oct 2022 11:20:08 +0530 Subject: [PATCH 263/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 29b681c2..80bb6013 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.8 +Sample Java Applicaiton V3.9 From 606df3471d17b9d5a8986704adbd797674556e76 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Sun, 2 Oct 2022 14:26:04 +0530 Subject: [PATCH 264/269] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efe7fc0d..1cfa002f 100644 --- a/pom.xml +++ b/pom.xml @@ -208,7 +208,7 @@ report - test + verify report From 24bdd07da93a83f98fbc02e39c85698e8aefea76 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Sun, 2 Oct 2022 21:32:13 +0530 Subject: [PATCH 265/269] Update Jenkinsfile-CI --- jenkins/Jenkinsfile-CI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/Jenkinsfile-CI b/jenkins/Jenkinsfile-CI index 43a745d6..008be8b7 100644 --- a/jenkins/Jenkinsfile-CI +++ b/jenkins/Jenkinsfile-CI @@ -33,7 +33,7 @@ pipeline { stage('codecoverage') { steps { echo 'codecoverage..' - sh script: '/opt/maven/bin/mvn test' + sh script: '/opt/maven/bin/mvn verify' } post { success { From 3ead3c97a0f3195d413ebf825bf3641a3c9ea8e1 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Mon, 3 Oct 2022 08:43:04 +0530 Subject: [PATCH 266/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80bb6013..1117cffa 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.9 +Sample Java Applicaiton V3.90 From d7965e57cf8e9f915152d2fbde3eaf26b7f053bd Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Tue, 15 Nov 2022 21:03:28 +0530 Subject: [PATCH 267/269] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1117cffa..353fa4bf 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -Sample Java Applicaiton V3.90 +Sample Java Applicaiton V3.91 From 1ae31326f1e48ccad9febdba002395b088f62496 Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Wed, 30 Nov 2022 22:50:17 +0530 Subject: [PATCH 268/269] Update cicd-docker-ansible-kube.gvy --- jenkins/cicd-docker-ansible-kube.gvy | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/jenkins/cicd-docker-ansible-kube.gvy b/jenkins/cicd-docker-ansible-kube.gvy index 12a7ce4e..f004665f 100644 --- a/jenkins/cicd-docker-ansible-kube.gvy +++ b/jenkins/cicd-docker-ansible-kube.gvy @@ -37,14 +37,13 @@ stages { } } stage('build & push docker image') { - steps { - sh 'cd $WORKSPACE' - sh 'docker build --file Dockerfile --tag lerndevops/samplejavaapp:$BUILD_NUMBER .' - withCredentials([string(credentialsId: 'DOCKER_HUB_PWD', variable: 'DOCKER_HUB_PWD')]) { - sh "docker login -u lerndevops -p ${DOCKER_HUB_PWD}" - } - sh 'docker push lerndevops/samplejavaapp:$BUILD_NUMBER' - } + steps { + withDockerRegistry(credentialsId: 'DOCKER_HUB_LOGIN', url: 'https://index.docker.io/v1/') { + sh script: 'cd $WORKSPACE' + sh script: 'docker build --file Dockerfile --tag docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER .' + sh script: 'docker push docker.io/lerndevops/samplejavaapp:$BUILD_NUMBER' + } + } } stage('Deploy-QA') { steps { From 47de38f19fc82601be2154e9a7fba7269d270f8f Mon Sep 17 00:00:00 2001 From: leaddevops <36464863+leaddevops@users.noreply.github.com> Date: Sun, 4 Dec 2022 20:04:19 +0530 Subject: [PATCH 269/269] Update Jenkinsfile-CI --- jenkins/Jenkinsfile-CI | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/jenkins/Jenkinsfile-CI b/jenkins/Jenkinsfile-CI index 008be8b7..b8cb888e 100644 --- a/jenkins/Jenkinsfile-CI +++ b/jenkins/Jenkinsfile-CI @@ -30,17 +30,6 @@ pipeline { } } } - stage('codecoverage') { - steps { - echo 'codecoverage..' - sh script: '/opt/maven/bin/mvn verify' - } - post { - success { - jacoco changeBuildStatus: true, maximumBranchCoverage: '10', maximumClassCoverage: '10', maximumComplexityCoverage: '10', maximumInstructionCoverage: '10', maximumLineCoverage: '10', maximumMethodCoverage: '10' - } - } - } stage('package') { steps { echo 'package......'