From 3c21c02cb17bfacb690ebeee26b74c1d16c27b8a Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:10:30 +0530
Subject: [PATCH 01/36] Delete .classpath
---
.classpath | 32 --------------------------------
1 file changed, 32 deletions(-)
delete mode 100644 .classpath
diff --git a/.classpath b/.classpath
deleted file mode 100644
index eb4c411..0000000
--- a/.classpath
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
From 7a53259a3d5fdc43c7ba510d461b6e74d93a0bfe Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:11:02 +0530
Subject: [PATCH 02/36] Delete .project
---
.project | 37 -------------------------------------
1 file changed, 37 deletions(-)
delete mode 100644 .project
diff --git a/.project b/.project
deleted file mode 100644
index e2c3574..0000000
--- a/.project
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
- devOpsWeb
-
-
-
-
-
- org.eclipse.jdt.core.javabuilder
-
-
-
-
- org.eclipse.wst.common.project.facet.core.builder
-
-
-
-
- org.eclipse.wst.validation.validationbuilder
-
-
-
-
- org.eclipse.m2e.core.maven2Builder
-
-
-
-
-
- org.eclipse.jem.workbench.JavaEMFNature
- org.eclipse.wst.common.modulecore.ModuleCoreNature
- org.eclipse.jdt.core.javanature
- org.eclipse.m2e.core.maven2Nature
- org.eclipse.wst.common.project.facet.core.nature
- org.eclipse.wst.jsdt.core.jsNature
-
-
From fed6fcb16b67e88ac6d187930d3f1fe602a73206 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:11:19 +0530
Subject: [PATCH 03/36] Delete Jenkinsfile
---
Jenkinsfile | 34 ----------------------------------
1 file changed, 34 deletions(-)
delete mode 100644 Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index f722447..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,34 +0,0 @@
-pipeline {
- agent any
-
- tools {
- maven 'local_maven'
- }
- parameters {
- string(name: 'staging_server', defaultValue: '13.232.37.20', description: 'Remote Staging Server')
- }
-
-stages{
- stage('Build'){
- steps {
- sh 'mvn clean package'
- }
- post {
- success {
- echo 'Archiving the artifacts'
- archiveArtifacts artifacts: '**/target/*.war'
- }
- }
- }
-
- stage ('Deployments'){
- parallel{
- stage ("Deploy to Staging"){
- steps {
- sh "scp -v -o StrictHostKeyChecking=no **/*.war root@${params.staging_server}:/opt/tomcat/webapps/"
- }
- }
- }
- }
- }
-}
From 2aa47b2d506bdd23698cfd6e40a45df90704b0f9 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:11:30 +0530
Subject: [PATCH 04/36] Delete Jenkinsfile_Docker_Local
---
Jenkinsfile_Docker_Local | 14 --------------
1 file changed, 14 deletions(-)
delete mode 100644 Jenkinsfile_Docker_Local
diff --git a/Jenkinsfile_Docker_Local b/Jenkinsfile_Docker_Local
deleted file mode 100644
index 7f7c1cc..0000000
--- a/Jenkinsfile_Docker_Local
+++ /dev/null
@@ -1,14 +0,0 @@
-pipeline{
- agent any
- tools {
- maven 'localMaven'
- }
- stages{
- stage('Build'){
- steps{
- sh 'mvn clean package'
- sh "docker build . -t tomcatwebapp:${env.BUILD_ID}"
- }
- }
- }
-}
From 7a27e328c3a9eb10edb41ad55795a745a6efe906 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:11:40 +0530
Subject: [PATCH 05/36] Delete Jenkinsfile_Docker_Remote
---
Jenkinsfile_Docker_Remote | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 Jenkinsfile_Docker_Remote
diff --git a/Jenkinsfile_Docker_Remote b/Jenkinsfile_Docker_Remote
deleted file mode 100644
index cf138a7..0000000
--- a/Jenkinsfile_Docker_Remote
+++ /dev/null
@@ -1,15 +0,0 @@
-pipeline{
- agent any
- tools {
- maven 'localMaven'
- }
- stages{
- stage('Build'){
- steps{
- sh 'mvn clean package'
- sh 'scp Dockerfile centos@3.17.61.170'
- sh 'ssh centos@3.17.61.170 "docker build . -t tomcatwebapp:${env.BUILD_ID}"'
- }
- }
- }
-}
From 902b2a3870e451d60a358d4ef0afc7c44147214e Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:12:15 +0530
Subject: [PATCH 06/36] Delete Dockerfile
---
Dockerfile | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 Dockerfile
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 88fe618..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM tomcat:8.0
-
-ADD ./target/*.war /usr/local/tomcat/webapps/
-
-EXPOSE 8080
-
-WORKDIR /usr/local/tomcat/webapps/
-
-CMD ["catalina.sh", "run"]
-
From cc3ed8693b714bba982899534ceabec24700fd3f Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:39:25 +0530
Subject: [PATCH 07/36] Update and rename Jenkinsfile_1.0 to Jenkinsfile
---
Jenkinsfile_1.0 => Jenkinsfile | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
rename Jenkinsfile_1.0 => Jenkinsfile (72%)
diff --git a/Jenkinsfile_1.0 b/Jenkinsfile
similarity index 72%
rename from Jenkinsfile_1.0
rename to Jenkinsfile
index d030fb6..fa0f99f 100644
--- a/Jenkinsfile_1.0
+++ b/Jenkinsfile
@@ -5,8 +5,7 @@ pipeline {
maven 'localMaven'
}
parameters {
- string(name: 'tomcat_stag', defaultValue: '13.59.108.184', description: 'Node1-Remote Staging Server')
- string(name: 'tomcat_prod', defaultValue: '18.219.228.98', description: 'Node2-Remote Production Server')
+ string(name: 'tomcat_stag', defaultValue: '13.232.236.86', description: 'Node1-Remote Staging Server1')
}
triggers {
@@ -36,7 +35,7 @@ stages{
stage ("Deploy to Production"){
steps {
- sh "scp **/*.war jenkins@${params.tomcat_prod}:/usr/share/tomcat/webapps/"
+ echo 'This is just a demo on Production server.'
}
}
}
From 3d12db906761ccfbf84444c044c5313cbee7169c Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:54:41 +0530
Subject: [PATCH 08/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index fa0f99f..c077c7a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -2,7 +2,7 @@ pipeline {
agent any
tools {
- maven 'localMaven'
+ maven 'local_maven'
}
parameters {
string(name: 'tomcat_stag', defaultValue: '13.232.236.86', description: 'Node1-Remote Staging Server1')
From 1600723bdb291ce4e7d0f9bed2820fe053b44d59 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 09:59:24 +0530
Subject: [PATCH 09/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index c077c7a..43b582a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ stages{
parallel{
stage ('Deploy to Staging'){
steps {
- sh "scp **/*.war jenkins@${params.tomcat_stag}:/usr/share/tomcat/webapps/"
+ sh "scp **/*.war root@${params.tomcat_stag}:/usr/share/tomcat/webapps/"
}
}
From 2638bd7c478932e28a4cc74b8d8bdb0c86fe9c20 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 10:05:19 +0530
Subject: [PATCH 10/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 43b582a..a6e3913 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ stages{
parallel{
stage ('Deploy to Staging'){
steps {
- sh "scp **/*.war root@${params.tomcat_stag}:/usr/share/tomcat/webapps/"
+ sh "scp **/*.war root@${params.tomcat_stag}:/opt/tomcat/webapps/"
}
}
From 8077fd22f3440eefe7114731215a8eb94840eb24 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 10:16:01 +0530
Subject: [PATCH 11/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a6e3913..4f0fb34 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,7 +29,7 @@ stages{
parallel{
stage ('Deploy to Staging'){
steps {
- sh "scp **/*.war root@${params.tomcat_stag}:/opt/tomcat/webapps/"
+ sh "scp **/*.war jenkins@${params.tomcat_stag}:/opt/tomcat/webapps/"
}
}
From 2fa1836203fd6330f5099038f79ac0c6a0de194a Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 10:25:15 +0530
Subject: [PATCH 12/36] Update Jenkinsfile
---
Jenkinsfile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4f0fb34..4d626fc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,6 +11,12 @@ pipeline {
triggers {
pollSCM('* * * * *')
}
+ environments {
+ fname = "Ranjit"
+ lname = "Swain"
+ version = "1.2"
+ system = "Dev"
+ }
stages{
stage('Build'){
@@ -29,7 +35,9 @@ stages{
parallel{
stage ('Deploy to Staging'){
steps {
- sh "scp **/*.war jenkins@${params.tomcat_stag}:/opt/tomcat/webapps/"
+ //sh "scp **/*.war jenkins@${params.tomcat_stag}:/opt/tomcat/webapps/"
+ echo "This is made by ${env.fname} ${env.lname}"
+ echo "it's running on ${env.system} and the version is ${env.version}
}
}
From e76a94ad7b5e78e0ec7ee6dec01a0e74492bc74e Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 10:26:39 +0530
Subject: [PATCH 13/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4d626fc..e11c260 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,7 +37,7 @@ stages{
steps {
//sh "scp **/*.war jenkins@${params.tomcat_stag}:/opt/tomcat/webapps/"
echo "This is made by ${env.fname} ${env.lname}"
- echo "it's running on ${env.system} and the version is ${env.version}
+ echo "it's running on ${env.system} and the version is ${env.version}"
}
}
From 797f6d24e0a6465dd2846f1a57a2ad7d1275fb5c Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sun, 7 Aug 2022 10:27:43 +0530
Subject: [PATCH 14/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index e11c260..1d67700 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ pipeline {
triggers {
pollSCM('* * * * *')
}
- environments {
+ environment {
fname = "Ranjit"
lname = "Swain"
version = "1.2"
From 8d03b4a8b836803ee1d7caeb1222471568d7321f Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Mon, 8 Aug 2022 18:41:05 +0530
Subject: [PATCH 15/36] Update Jenkinsfile
---
Jenkinsfile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1d67700..0e1c02a 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,6 +38,7 @@ stages{
//sh "scp **/*.war jenkins@${params.tomcat_stag}:/opt/tomcat/webapps/"
echo "This is made by ${env.fname} ${env.lname}"
echo "it's running on ${env.system} and the version is ${env.version}"
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: '/opt/tomcat/webapps', war: '**/*.war'
}
}
From 4fc0ada7ea7ac2c6c6197927d6360d77aa84e206 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Mon, 8 Aug 2022 22:55:00 +0530
Subject: [PATCH 16/36] Delete Jenkinsfile
---
Jenkinsfile | 53 -----------------------------------------------------
1 file changed, 53 deletions(-)
delete mode 100644 Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 0e1c02a..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,53 +0,0 @@
-pipeline {
- agent any
-
- tools {
- maven 'local_maven'
- }
- parameters {
- string(name: 'tomcat_stag', defaultValue: '13.232.236.86', description: 'Node1-Remote Staging Server1')
- }
-
- triggers {
- pollSCM('* * * * *')
- }
- environment {
- fname = "Ranjit"
- lname = "Swain"
- version = "1.2"
- system = "Dev"
- }
-
-stages{
- stage('Build'){
- steps {
- sh 'mvn clean package'
- }
- post {
- success {
- echo 'Archiving the artifacts'
- archiveArtifacts artifacts: '**/target/*.war'
- }
- }
- }
-
- stage ('Deployments'){
- parallel{
- stage ('Deploy to Staging'){
- steps {
- //sh "scp **/*.war jenkins@${params.tomcat_stag}:/opt/tomcat/webapps/"
- echo "This is made by ${env.fname} ${env.lname}"
- echo "it's running on ${env.system} and the version is ${env.version}"
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: '/opt/tomcat/webapps', war: '**/*.war'
- }
- }
-
- stage ("Deploy to Production"){
- steps {
- echo 'This is just a demo on Production server.'
- }
- }
- }
- }
- }
-}
From 17209c97716ceb07ff061dd9f996525442396dc1 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Tue, 9 Aug 2022 09:49:58 +0530
Subject: [PATCH 17/36] Add files via upload
---
Jenkinsfile | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 Jenkinsfile
diff --git a/Jenkinsfile b/Jenkinsfile
new file mode 100644
index 0000000..1f7ea01
--- /dev/null
+++ b/Jenkinsfile
@@ -0,0 +1,22 @@
+pipeline{
+ agent any
+
+ stages{
+ stage ('Build'){
+ steps{
+ sh 'mvn clean package'
+ }
+ post{
+ success{
+ echo "Archiving the Artifacts"
+ archiveArtifacts artifacts: '**/target/*.war'
+ }
+ }
+ }
+ stage ('Deploy to tomcat server') {
+ steps{
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: '/opt/tomcat/webapps', war: '**/*.war'
+ }
+ }
+ }
+}
\ No newline at end of file
From b89cecae01d2f1c253718b385a080575bff032bf Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Tue, 9 Aug 2022 09:52:03 +0530
Subject: [PATCH 18/36] Add files via upload
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1f7ea01..cca1074 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,8 @@
pipeline{
agent any
-
+ tools{
+ maven 'local_maven'
+ }
stages{
stage ('Build'){
steps{
From e25d4e86402db5e1343f94e47769cae323a15e19 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Tue, 9 Aug 2022 09:56:22 +0530
Subject: [PATCH 19/36] Update template.xhtml
---
src/main/webapp/template.xhtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 1b85a5d..2a87d98 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -10,7 +10,7 @@
-DevOps class - Ranjit Swain - Version: 2.0 - Batch4
+DevOps class - Ranjit Swain - Version: 2.6
Just an example! - Webhook
From b396272392c51fa87a70d91221c9c9d8f957c100 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Tue, 9 Aug 2022 10:05:30 +0530
Subject: [PATCH 20/36] Update Jenkinsfile
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index cca1074..881cf52 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,8 +17,8 @@ pipeline{
}
stage ('Deploy to tomcat server') {
steps{
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: '/opt/tomcat/webapps', war: '**/*.war'
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: null, war: '"**/*.war"'
}
}
}
-}
\ No newline at end of file
+}
From 43e3c7274e5d34138dfac2a52002f0cb3e89a67c Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Tue, 9 Aug 2022 10:07:42 +0530
Subject: [PATCH 21/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 881cf52..b17a63e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline{
}
stage ('Deploy to tomcat server') {
steps{
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: null, war: '"**/*.war"'
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: null, war: '**/*.war'
}
}
}
From 04acdd180d120dbb71e26ff7afa587673734d5f3 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 19:46:16 +0530
Subject: [PATCH 22/36] Update Jenkinsfile
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b17a63e..1300d9b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,9 @@ pipeline{
}
stage ('Deploy to tomcat server') {
steps{
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://3.108.221.41:8282/')], contextPath: null, war: '**/*.war'
+ readProp = readProperties file: 'build.properties'
+ echo "Deploying into ${readProp['deploy.type']}"
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: '**/*.war'
}
}
}
From 3769581966c39c69e0e11dd1c4fb60de2211e782 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 19:51:11 +0530
Subject: [PATCH 23/36] Update Jenkinsfile
---
Jenkinsfile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 1300d9b..4bb4565 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,9 @@ pipeline{
}
stage ('Deploy to tomcat server') {
steps{
- readProp = readProperties file: 'build.properties'
+ script{
+ readProp = readProperties file: 'build.properties'
+ }
echo "Deploying into ${readProp['deploy.type']}"
deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: '**/*.war'
}
From f8d47613c6d68e5ea8f8d2d2559a19815e490161 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 19:55:08 +0530
Subject: [PATCH 24/36] Create build.properties
---
build.properties | 3 +++
1 file changed, 3 insertions(+)
create mode 100644 build.properties
diff --git a/build.properties b/build.properties
new file mode 100644
index 0000000..6ac593b
--- /dev/null
+++ b/build.properties
@@ -0,0 +1,3 @@
+deploy.app.name=finProject
+deploy.environment=sandbox
+deploy.type=staging
From ec571e2a8da043ed062ad7ec6fa87437e8e7641a Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 19:56:24 +0530
Subject: [PATCH 25/36] Update build.properties
---
build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties b/build.properties
index 6ac593b..30715b5 100644
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,3 @@
-deploy.app.name=finProject
+deploy.app.name=devOpsWeb
deploy.environment=sandbox
deploy.type=staging
From e9539df80f7608bdf525207473170c2bf2f3dad2 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 19:58:06 +0530
Subject: [PATCH 26/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 4bb4565..223f3b7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline{
readProp = readProperties file: 'build.properties'
}
echo "Deploying into ${readProp['deploy.type']}"
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: '**/*.war'
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: '**/${readProp['deploy.app.name']}.war'
}
}
}
From a9d709698ffd77d4b2ce4222dc9e25a64f505a1c Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 19:59:51 +0530
Subject: [PATCH 27/36] Update Jenkinsfile
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 223f3b7..be58443 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline{
readProp = readProperties file: 'build.properties'
}
echo "Deploying into ${readProp['deploy.type']}"
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: '**/${readProp['deploy.app.name']}.war'
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/${readProp['deploy.app.name']}.war"
}
}
}
From f9df820040e135f03f8cf5193be1d865d7c6aa26 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 20:09:42 +0530
Subject: [PATCH 28/36] Update template.xhtml
---
src/main/webapp/template.xhtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 2a87d98..719823a 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -10,7 +10,7 @@
-DevOps class - Ranjit Swain - Version: 2.6
+DevOps class - Ranjit Swain - Version: 2.6.1
Just an example! - Webhook
From cc27458e7c25209440a0ccd1dfe78b991705e954 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 21:10:38 +0530
Subject: [PATCH 29/36] Add files via upload
---
Jenkinsfile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index be58443..44affe5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,11 +18,11 @@ pipeline{
stage ('Deploy to tomcat server') {
steps{
script{
- readProp = readProperties file: 'build.properties'
+ readProp = readPrperties file: 'build.properties'
}
- echo "Deploying into ${readProp['deploy.type']}"
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/${readProp['deploy.app.name']}.war"
+ echo "This is running on ${readProp['deploy.type']}"
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/*.war"
}
}
}
-}
+}
\ No newline at end of file
From 3e64e2a840de8f2871e28ca4ca29cbaa821dfb2b Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 21:11:47 +0530
Subject: [PATCH 30/36] Add files via upload
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 44affe5..97d6fce 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline{
stage ('Deploy to tomcat server') {
steps{
script{
- readProp = readPrperties file: 'build.properties'
+ readProp = readProperties file: 'build.properties'
}
echo "This is running on ${readProp['deploy.type']}"
deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/*.war"
From e0372e146de689dbd660a0c132322bdc1a796522 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 21:13:32 +0530
Subject: [PATCH 31/36] Add files via upload
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 97d6fce..73ab3b9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -21,7 +21,7 @@ pipeline{
readProp = readProperties file: 'build.properties'
}
echo "This is running on ${readProp['deploy.type']}"
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/*.war"
+ deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/${readProp['deploy.app.name']}.war"
}
}
}
From 75346d41d86b4ebc7d898f02568281de0a7d962c Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Fri, 12 Aug 2022 21:14:30 +0530
Subject: [PATCH 32/36] Update template.xhtml
---
src/main/webapp/template.xhtml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/main/webapp/template.xhtml b/src/main/webapp/template.xhtml
index 719823a..e6b61b2 100644
--- a/src/main/webapp/template.xhtml
+++ b/src/main/webapp/template.xhtml
@@ -10,7 +10,7 @@
-DevOps class - Ranjit Swain - Version: 2.6.1
+DevOps class - Ranjit Swain - Version: 2.7
Just an example! - Webhook
From 90d7c389abea4173e1dc2ca9a2a4ca7038fec1a2 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sat, 20 Aug 2022 10:28:39 +0530
Subject: [PATCH 33/36] Update Jenkinsfile
---
Jenkinsfile | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 73ab3b9..833fa06 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,7 @@
pipeline{
- agent any
+ agent {
+ label 'linuxagent'
+ }
tools{
maven 'local_maven'
}
@@ -17,12 +19,14 @@ pipeline{
}
stage ('Deploy to tomcat server') {
steps{
- script{
+ /*script{
readProp = readProperties file: 'build.properties'
}
echo "This is running on ${readProp['deploy.type']}"
deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/${readProp['deploy.app.name']}.war"
+ */
+ echo "Deployment"
}
}
}
-}
\ No newline at end of file
+}
From c0e5ecf4f5e00d9d897aaf3e24f591268a7199f7 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sat, 20 Aug 2022 10:30:21 +0530
Subject: [PATCH 34/36] Update Jenkinsfile
---
Jenkinsfile | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index 833fa06..a6e0655 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,12 +19,7 @@ pipeline{
}
stage ('Deploy to tomcat server') {
steps{
- /*script{
- readProp = readProperties file: 'build.properties'
- }
- echo "This is running on ${readProp['deploy.type']}"
- deploy adapters: [tomcat7(credentialsId: '58cccd86-7ec3-4a1a-8dfd-8f664aff0392', path: '', url: 'http://52.66.198.184:8282/')], contextPath: null, war: "**/${readProp['deploy.app.name']}.war"
- */
+
echo "Deployment"
}
}
From 942863928ca981c2f8d92ff039784f53d0a3a4d2 Mon Sep 17 00:00:00 2001
From: Ranjit Swain <58227542+ranjit4github@users.noreply.github.com>
Date: Sat, 15 Apr 2023 11:57:59 +0530
Subject: [PATCH 35/36] Update build.properties
---
build.properties | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.properties b/build.properties
index 30715b5..eff618a 100644
--- a/build.properties
+++ b/build.properties
@@ -1,3 +1,3 @@
deploy.app.name=devOpsWeb
deploy.environment=sandbox
-deploy.type=staging
+deploy.type=dev
From 6e85f8697546fd2bacb447e468e0a7e58b52eaeb Mon Sep 17 00:00:00 2001
From: prasadperla55 <137373532+prasadperla55@users.noreply.github.com>
Date: Sat, 1 Jul 2023 22:55:56 +0530
Subject: [PATCH 36/36] Update Jenkinsfile
---
Jenkinsfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index a6e0655..eaef407 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,5 +1,5 @@
pipeline{
- agent {
+ agent any{
label 'linuxagent'
}
tools{
@@ -19,7 +19,7 @@ pipeline{
}
stage ('Deploy to tomcat server') {
steps{
-
+ deploy adapters: [tomcat9(credentialsId: 'd27472d4-1d20-42e9-aefc-45d27de10a05', path: '', url: 'http://52.66.214.37:8080/')], contextPath: null, war: '**/*.war'
echo "Deployment"
}
}