From eb6747515113f7be61af0566516b736eaa548caf Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Wed, 22 Jun 2022 23:26:05 -0600 Subject: [PATCH 01/12] Updated pom with sonarqube IP address --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3669c1ce..20b87ca4 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://50.19.176.11:5000/ + http://172.31.7.6:9000/ admin - admin123 + admin UTF-8 UTF-8 From 5df7786028ac99aafdcd9cf5f9312069e4d4259a Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Thu, 23 Jun 2022 00:52:32 -0600 Subject: [PATCH 02/12] Updated nexus details in the pom file --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 20b87ca4..d20c61ea 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://172.31.94.25:8081/repository/UBA-release/ + http://52.24.33.54:8081/repository/rbc-app-release/ nexus ACADA Learning Snapshot Nexus Repository - http://172.31.94.25:8081/repository/UBA-Snapshot/ + http://52.24.33.54:8081/repository/rbc-app-snapshot/ From 3268352ecaffd66dc63945c6619a0319ca65ffc9 Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Thu, 23 Jun 2022 01:21:37 -0600 Subject: [PATCH 03/12] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d20c61ea..6310a0e1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.1-RELEASE + 2.0.2-RELEASE maven-web-application From b2a16460d441b84581fd9539258c9a5c52f2217e Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Thu, 23 Jun 2022 01:28:31 -0600 Subject: [PATCH 04/12] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6310a0e1..f9ce2831 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.2-RELEASE + 2.0.2-SNAPSHOT maven-web-application From a69b8a7ecd8971eea397264975cbeffac3c70ceb Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Sat, 25 Jun 2022 08:21:33 -0600 Subject: [PATCH 05/12] Updated the nexus ip --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index f9ce2831..3dc9178f 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://52.24.33.54:8081/repository/rbc-app-release/ + http://172.31.10.202:8081/repository/rbc-app-release/ nexus ACADA Learning Snapshot Nexus Repository - http://52.24.33.54:8081/repository/rbc-app-snapshot/ + http://172.31.10.202:8081/repository/rbc-app-snapshot/ From 7be7c4810eadf30f335a9d492ee393c6ab28b403 Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Sun, 26 Jun 2022 17:46:52 -0600 Subject: [PATCH 06/12] Updated nexus ip in pom --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 3dc9178f..52e95da8 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.2-SNAPSHOT + 2.0.3-RELEASE maven-web-application @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://172.31.10.202:8081/repository/rbc-app-release/ + http://http://172.31.10.202:8081/repository/td-app-release/ nexus ACADA Learning Snapshot Nexus Repository - http://172.31.10.202:8081/repository/rbc-app-snapshot/ + http://172.31.10.202:8081/repository/td-app-snapshot/ From 6137ed0d55ee1eddf6fd42bf3267f22f395093bd Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Sun, 26 Jun 2022 17:54:19 -0600 Subject: [PATCH 07/12] changed to nexus public ip in pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 52e95da8..b2e2cfe9 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://http://172.31.10.202:8081/repository/td-app-release/ + http://http://18.237.13.216:8081/repository/td-app-release/ nexus ACADA Learning Snapshot Nexus Repository - http://172.31.10.202:8081/repository/td-app-snapshot/ + http://18.237.13.216:8081/repository/td-app-snapshot/ From 8c6003c05d846d5603d8c9285fd04899193fa8b1 Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Sun, 26 Jun 2022 18:03:16 -0600 Subject: [PATCH 08/12] Changed to snapshot --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b2e2cfe9..952ed74b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.mt maven-web-application war - 2.0.3-RELEASE + 2.0.3-SNAPSHOT maven-web-application From e0c197da41bf131eed3e8f09495e7eda940b9fc5 Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Sun, 26 Jun 2022 18:18:04 -0600 Subject: [PATCH 09/12] Changed to private ip --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 952ed74b..4256813e 100644 --- a/pom.xml +++ b/pom.xml @@ -97,13 +97,13 @@ nexus ACADA Learning Releases Nexus Repository - http://http://18.237.13.216:8081/repository/td-app-release/ + http://http://172.31.10.202:8081/repository/td-app-release/ nexus ACADA Learning Snapshot Nexus Repository - http://18.237.13.216:8081/repository/td-app-snapshot/ + http://172.31.10.202:8081/repository/td-app-snapshot/ From 5bd728eeaf1cd36a7fb2c2e5f6525028de6cc368 Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Sat, 2 Jul 2022 21:23:27 -0600 Subject: [PATCH 10/12] New jenkinsfile --- jenkinsfileNnenna | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 jenkinsfileNnenna diff --git a/jenkinsfileNnenna b/jenkinsfileNnenna new file mode 100644 index 00000000..4cbe0f48 --- /dev/null +++ b/jenkinsfileNnenna @@ -0,0 +1,45 @@ +pipeline{ + agent any + tools{ + maven "maven3.8.6" + } + stages{ + stage("1.CodeClone"){ + steps{ + git credentialsId: 'Github-Cred2', url: 'https://github.com/Nubanwani6/web-app.git' + } + } + stage("2.Build"){ + steps{ + sh "mvn clean package" + } + } + stage("3.Artifacts"){ + steps{ + sh "mvn deploy" + } + } + stage("4.DeploytoUAT"){ + steps{ + deploy adapters: [tomcat9(credentialsId: 'tomcat-cred', path: '', url: 'http://54.184.138.80:8080/')], contextPath: null, war: 'target/*.war' + } + } + stage("5.Approval"){ + steps{ + timeout(time:5, unit:'DAYS'){ + input message: 'Approval for Production' + } + } + } + stage("6.DeploytoPROD"){ + steps{ + deploy adapters: [tomcat9(credentialsId: 'tomcat-cred', path: '', url: 'http://54.184.138.80:8080/')], contextPath: null, war: 'target/*.war' + } + } + stage("7.EmailNotification"){ + steps{ + emailext body: 'This is Build Success', subject: 'Build Success', to: 'info@acadalearning.com' + } + } + } +} From f82b896235fb8caddea8cfa64707852acb05470a Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Wed, 13 Jul 2022 06:58:38 -0600 Subject: [PATCH 11/12] Updated Sonar to Docker IP --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4256813e..0b7dabbe 100644 --- a/pom.xml +++ b/pom.xml @@ -21,9 +21,9 @@ 5.1.2.RELEASE 4.11 1.2.17 - http://172.31.7.6:9000/ + http://172.31.15.25:5000/ admin - admin + admin123 UTF-8 UTF-8 From c17b5571247c0c7712fb3a83d5b8c3aa00f794dc Mon Sep 17 00:00:00 2001 From: Nubanwani6 <105896365+Nubanwani6@users.noreply.github.com> Date: Wed, 13 Jul 2022 23:33:55 -0600 Subject: [PATCH 12/12] Updated dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14a2807e..ab6905ac 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,2 @@ FROM tomcat:8.0.20-jre8 -COPY target/*.war /usr/local/tomcat/webapps/td.war +COPY target/*.war /usr/local/tomcat/webapps/cohort7.war