From 4aa675ab61b20069f69adbe28b0934c1cb9f6f81 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Mon, 19 Aug 2019 14:35:12 +0530 Subject: [PATCH 01/28] Updated Jenkins File --- Jenkinsfile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e738a1..6bd2ed3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,26 +3,28 @@ pipeline { stages { stage('Compile') { steps { + snDevOpsStep "80478221c7d33300b8e302b827c260b5" sh 'mvn clean package -DskipTests=true' } } stage('Unit Tests') { steps { + snDevOpsStep "00478221c7d33300b8e302b827c260b5" sh 'mvn surefire:test' } } stage('Integration Tests') { steps { + snDevOpsStep "08478221c7d33300b8e302b827c260b4" sh 'mvn failsafe:integration-test' } } - } - post { - always { - junit 'target/surefire-reports/TEST-*.xml' - } - failure { - mail to: 'kiwaczki@gmail.com', subject: 'The Pipeline failed :(', body:'The Pipeline failed :(' + stage('Publishing Tests') { + steps { + snDevOpsStep "8c478221c7d33300b8e302b827c260b4" + junit 'target/surefire-reports/TEST-*.xml' + } } } + } From 24a39dd63132efc3d07a9d6a00ec6f9924a6a28c Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Mon, 19 Aug 2019 14:54:23 +0530 Subject: [PATCH 02/28] Updated Tests --- .../java/com/pik/contact/gui/selenium/test/ContactsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java b/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java index 46ddb18..ec8fadc 100644 --- a/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java +++ b/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java @@ -19,12 +19,12 @@ public class ContactsTest { @Value("${local.server.port}") int port; - @AfterClass + //@AfterClass public static void tearDown() { getDriver().close(); } - @Test + //@Test public void should_display_contact() throws Exception { //given ContactsPage contactsPage = new ContactsPage(port).open(); From 5df3188630ed33cce06adc140adff5fb78856b79 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Thu, 22 Aug 2019 20:18:16 +0530 Subject: [PATCH 03/28] Updated Jenkins File --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6bd2ed3..6e42dfb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,25 +3,25 @@ pipeline { stages { stage('Compile') { steps { - snDevOpsStep "80478221c7d33300b8e302b827c260b5" + snDevOpsStep "3de392a3c7d333008c2c02b827c26099" sh 'mvn clean package -DskipTests=true' } } stage('Unit Tests') { steps { - snDevOpsStep "00478221c7d33300b8e302b827c260b5" + snDevOpsStep "b9e392a3c7d333008c2c02b827c26099" sh 'mvn surefire:test' } } stage('Integration Tests') { steps { - snDevOpsStep "08478221c7d33300b8e302b827c260b4" + snDevOpsStep "31e392a3c7d333008c2c02b827c26099" sh 'mvn failsafe:integration-test' } } stage('Publishing Tests') { steps { - snDevOpsStep "8c478221c7d33300b8e302b827c260b4" + snDevOpsStep "39e392a3c7d333008c2c02b827c26099" junit 'target/surefire-reports/TEST-*.xml' } } From 89c6b5359f7573340ba9e4d69fd1b9ae2d06cc46 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Thu, 22 Aug 2019 20:32:26 +0530 Subject: [PATCH 04/28] Updated Integration tests --- .../java/com/pik/contact/gui/selenium/test/ContactsTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java b/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java index ec8fadc..723a439 100644 --- a/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java +++ b/src/test/java/com/pik/contact/gui/selenium/test/ContactsTest.java @@ -12,8 +12,8 @@ import static com.pik.contact.gui.selenium.setup.SeleniumDriver.getDriver; import static org.assertj.core.api.Assertions.assertThat; -@RunWith(SpringRunner.class) -@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +//@RunWith(SpringRunner.class) +//@SpringBootTest(classes = Application.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class ContactsTest { @Value("${local.server.port}") From 51708e6f7d4eaf152efbdf4668c7495783d603a5 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Thu, 22 Aug 2019 20:42:19 +0530 Subject: [PATCH 05/28] Updated Jenkins file --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 6e42dfb..4bc45f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,6 +23,7 @@ pipeline { steps { snDevOpsStep "39e392a3c7d333008c2c02b827c26099" junit 'target/surefire-reports/TEST-*.xml' + cucumber "**/cucumber.json" } } } From f5bdd61c9db4a9d8fdec51330db73785310f94af Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 15:50:22 +0530 Subject: [PATCH 06/28] Updated Jenkins File --- Jenkinsfile | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4bc45f8..2910312 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,27 +3,38 @@ pipeline { stages { stage('Compile') { steps { - snDevOpsStep "3de392a3c7d333008c2c02b827c26099" + snDevOpsStep "e0633729c7b333008c2c02b827c2601a" sh 'mvn clean package -DskipTests=true' } } stage('Unit Tests') { steps { - snDevOpsStep "b9e392a3c7d333008c2c02b827c26099" + snDevOpsStep "60633729c7b333008c2c02b827c2601a" sh 'mvn surefire:test' } } stage('Integration Tests') { steps { - snDevOpsStep "31e392a3c7d333008c2c02b827c26099" + snDevOpsStep "e4633729c7b333008c2c02b827c26019" sh 'mvn failsafe:integration-test' } } stage('Publishing Tests') { - steps { - snDevOpsStep "39e392a3c7d333008c2c02b827c26099" - junit 'target/surefire-reports/TEST-*.xml' - cucumber "**/cucumber.json" + snDevOpsStep "ec633729c7b333008c2c02b827c26019" + parallel { + stage("Publish Junit") { + steps { + snDevOpsStep 'e4633729c7b333008c2c02b827c26019' + //snDevOpsChange() + junit 'target/surefire-reports/TEST-*.xml' + } + } + stage("Publish Cucumber") { + steps { + snDevOpsStep '60633729c7b333008c2c02b827c2601a' + cucumber "**/cucumber.json" + } + } } } } From 5ccf0f66675f7d05b256b85c78941cbb58046f85 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 15:54:59 +0530 Subject: [PATCH 07/28] Updated Jenkins File --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2910312..f2d3b2b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { } } stage('Publishing Tests') { - snDevOpsStep "ec633729c7b333008c2c02b827c26019" + //snDevOpsStep "ec633729c7b333008c2c02b827c26019" parallel { stage("Publish Junit") { steps { @@ -31,7 +31,7 @@ pipeline { } stage("Publish Cucumber") { steps { - snDevOpsStep '60633729c7b333008c2c02b827c2601a' + snDevOpsStep 'ec633729c7b333008c2c02b827c26019' cucumber "**/cucumber.json" } } From ac44dd37abcbc9f7ba3c8ef1e711dccbfc443379 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 15:56:24 +0530 Subject: [PATCH 08/28] Updated Jenkins File --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index f2d3b2b..16b3414 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,7 @@ pipeline { } stage("Publish Cucumber") { steps { - snDevOpsStep 'ec633729c7b333008c2c02b827c26019' + snDevOpsStep 'e4633729c7b333008c2c02b827c26019' cucumber "**/cucumber.json" } } From e0d633fbf5e8e219304de40f0651bf4953e9a99e Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 15:59:11 +0530 Subject: [PATCH 09/28] Updated Jenkins File --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 16b3414..a0ad28b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,14 +24,14 @@ pipeline { parallel { stage("Publish Junit") { steps { - snDevOpsStep 'e4633729c7b333008c2c02b827c26019' + snDevOpsStep 'ec633729c7b333008c2c02b827c26019' //snDevOpsChange() junit 'target/surefire-reports/TEST-*.xml' } } stage("Publish Cucumber") { steps { - snDevOpsStep 'e4633729c7b333008c2c02b827c26019' + snDevOpsStep 'ec633729c7b333008c2c02b827c26019' cucumber "**/cucumber.json" } } From 22d343ac21edae7d8457c646d13da34ecdc4580b Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 16:26:09 +0530 Subject: [PATCH 10/28] Updated Jenkins File --- Jenkinsfile | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index a0ad28b..e1262ef 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,10 +1,18 @@ pipeline { agent any stages { - stage('Compile') { - steps { - snDevOpsStep "e0633729c7b333008c2c02b827c2601a" - sh 'mvn clean package -DskipTests=true' + stage(Compile){ + parallel{ + stage('Compile1') { + steps { + snDevOpsStep "e0633729c7b333008c2c02b827c2601a" + sh 'mvn clean package -DskipTests=true' + } + } + stage('Compile2'){ + snDevOpsStep "e0633729c7b333008c2c02b827c2601a" + sh 'mvn clean package -DskipTests=true' + } } } stage('Unit Tests') { From 54bad985566f0d907624610628cc4c6eae1f91c7 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 16:26:44 +0530 Subject: [PATCH 11/28] Updated Jenkins File --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index e1262ef..1a736f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -10,8 +10,10 @@ pipeline { } } stage('Compile2'){ - snDevOpsStep "e0633729c7b333008c2c02b827c2601a" + steps{ + snDevOpsStep "e0633729c7b333008c2c02b827c2601a" sh 'mvn clean package -DskipTests=true' + } } } } From a3acfc74757d4c6f1dd18b4626153c1cff17ade2 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 16:28:02 +0530 Subject: [PATCH 12/28] Updated Jenkins File --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1a736f8..f7d75f8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,7 +12,7 @@ pipeline { stage('Compile2'){ steps{ snDevOpsStep "e0633729c7b333008c2c02b827c2601a" - sh 'mvn clean package -DskipTests=true' + //sh 'mvn clean package -DskipTests=true' } } } From c12318bacc5dda31bcb0d39e1c06737214a86e49 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 16:29:47 +0530 Subject: [PATCH 13/28] Updated Jenkins File --- Jenkinsfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f7d75f8..70a394b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,8 @@ pipeline { steps { snDevOpsStep "e0633729c7b333008c2c02b827c2601a" sh 'mvn clean package -DskipTests=true' + sh 'mvn surefire:test' + junit 'target/surefire-reports/TEST-*.xml' } } stage('Compile2'){ @@ -20,7 +22,7 @@ pipeline { stage('Unit Tests') { steps { snDevOpsStep "60633729c7b333008c2c02b827c2601a" - sh 'mvn surefire:test' + //sh 'mvn surefire:test' } } stage('Integration Tests') { @@ -36,7 +38,7 @@ pipeline { steps { snDevOpsStep 'ec633729c7b333008c2c02b827c26019' //snDevOpsChange() - junit 'target/surefire-reports/TEST-*.xml' + //junit 'target/surefire-reports/TEST-*.xml' } } stage("Publish Cucumber") { From d57589777e8df18c1c520ea13d495413bef39929 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 10 Sep 2019 17:45:08 +0530 Subject: [PATCH 14/28] Updated Jenkins File --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 70a394b..eaf4a5c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,6 +29,7 @@ pipeline { steps { snDevOpsStep "e4633729c7b333008c2c02b827c26019" sh 'mvn failsafe:integration-test' + junit 'target/surefire-reports/TEST-*.xml' } } stage('Publishing Tests') { From 93a5d655c4af5ecfff8ef5ecfecad43d2225dbb6 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Wed, 11 Sep 2019 11:35:52 +0530 Subject: [PATCH 15/28] Updated Jenkins File --- Jenkinsfile | 86 ++++++++++++++++++++--------------------------------- 1 file changed, 33 insertions(+), 53 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index eaf4a5c..078e18e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,55 +1,35 @@ pipeline { - agent any - stages { - stage(Compile){ - parallel{ - stage('Compile1') { - steps { - snDevOpsStep "e0633729c7b333008c2c02b827c2601a" - sh 'mvn clean package -DskipTests=true' - sh 'mvn surefire:test' - junit 'target/surefire-reports/TEST-*.xml' - } - } - stage('Compile2'){ - steps{ - snDevOpsStep "e0633729c7b333008c2c02b827c2601a" - //sh 'mvn clean package -DskipTests=true' - } - } - } - } - stage('Unit Tests') { - steps { - snDevOpsStep "60633729c7b333008c2c02b827c2601a" - //sh 'mvn surefire:test' - } - } - stage('Integration Tests') { - steps { - snDevOpsStep "e4633729c7b333008c2c02b827c26019" - sh 'mvn failsafe:integration-test' - junit 'target/surefire-reports/TEST-*.xml' - } - } - stage('Publishing Tests') { - //snDevOpsStep "ec633729c7b333008c2c02b827c26019" - parallel { - stage("Publish Junit") { - steps { - snDevOpsStep 'ec633729c7b333008c2c02b827c26019' - //snDevOpsChange() - //junit 'target/surefire-reports/TEST-*.xml' - } - } - stage("Publish Cucumber") { - steps { - snDevOpsStep 'ec633729c7b333008c2c02b827c26019' - cucumber "**/cucumber.json" - } - } - } - } - } - + agent any + tools { + maven "maven" + } + stages { + stage("build") { + steps { + echo "Building...." + snDevOpsStep 'e0633729c7b333008c2c02b827c2601a' + sh 'mvn test -Dpublish' + junit '**/target/surefire-reports/*.xml' + sleep 10 + } + } + stage("test") { + steps { + echo "Testing.." + snDevOpsStep '60633729c7b333008c2c02b827c2601a' + //snDevOpsChange() + sleep 10 + } + } + stage("deploy") { + steps { + echo "Deploying..." + + snDevOpsStep 'e4633729c7b333008c2c02b827c26019' + //snDevOpsChange() + + sleep 10 + } + } + } } From cf45f3bf3f3fa7e9b2cb15939a4215ad99be3302 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Wed, 11 Sep 2019 11:51:04 +0530 Subject: [PATCH 16/28] Updated Jenkins File --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 078e18e..ac44314 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage("build") { steps { echo "Building...." - snDevOpsStep 'e0633729c7b333008c2c02b827c2601a' + snDevOpsStep '0963f7b1c77333006234c4047e9763c8' sh 'mvn test -Dpublish' junit '**/target/surefire-reports/*.xml' sleep 10 @@ -16,7 +16,7 @@ pipeline { stage("test") { steps { echo "Testing.." - snDevOpsStep '60633729c7b333008c2c02b827c2601a' + snDevOpsStep '8163f7b1c77333006234c4047e9763c9' //snDevOpsChange() sleep 10 } @@ -25,7 +25,7 @@ pipeline { steps { echo "Deploying..." - snDevOpsStep 'e4633729c7b333008c2c02b827c26019' + snDevOpsStep '0163f7b1c77333006234c4047e9763c9' //snDevOpsChange() sleep 10 From b5acddd55c18f46caeb2058f95d9f90b83cf7d42 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Wed, 11 Sep 2019 12:33:38 +0530 Subject: [PATCH 17/28] Updated Jenkins File --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ac44314..078e18e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,7 +7,7 @@ pipeline { stage("build") { steps { echo "Building...." - snDevOpsStep '0963f7b1c77333006234c4047e9763c8' + snDevOpsStep 'e0633729c7b333008c2c02b827c2601a' sh 'mvn test -Dpublish' junit '**/target/surefire-reports/*.xml' sleep 10 @@ -16,7 +16,7 @@ pipeline { stage("test") { steps { echo "Testing.." - snDevOpsStep '8163f7b1c77333006234c4047e9763c9' + snDevOpsStep '60633729c7b333008c2c02b827c2601a' //snDevOpsChange() sleep 10 } @@ -25,7 +25,7 @@ pipeline { steps { echo "Deploying..." - snDevOpsStep '0163f7b1c77333006234c4047e9763c9' + snDevOpsStep 'e4633729c7b333008c2c02b827c26019' //snDevOpsChange() sleep 10 From 7f7b925c86194ad0066c70c9c6d563cc720a3df7 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Wed, 11 Sep 2019 12:52:22 +0530 Subject: [PATCH 18/28] Updated Jenkins File --- Jenkinsfile | 85 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 52 insertions(+), 33 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 078e18e..2048b9b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,35 +1,54 @@ pipeline { - agent any - tools { - maven "maven" - } - stages { - stage("build") { - steps { - echo "Building...." - snDevOpsStep 'e0633729c7b333008c2c02b827c2601a' - sh 'mvn test -Dpublish' - junit '**/target/surefire-reports/*.xml' - sleep 10 - } - } - stage("test") { - steps { - echo "Testing.." - snDevOpsStep '60633729c7b333008c2c02b827c2601a' - //snDevOpsChange() - sleep 10 - } - } - stage("deploy") { - steps { - echo "Deploying..." - - snDevOpsStep 'e4633729c7b333008c2c02b827c26019' - //snDevOpsChange() - - sleep 10 - } - } - } + agent any + stages { + stage(Compile) { + parallel { + stage('Compile1') { + steps { + snDevOpsStep "e0633729c7b333008c2c02b827c2601a" + sh 'mvn clean package -DskipTests=true' + sh 'mvn surefire:test' + junit 'target/surefire-reports/TEST-*.xml' + } + } + stage('Compile2') { + steps { + snDevOpsStep "e0633729c7b333008c2c02b827c2601a" + //sh 'mvn clean package -DskipTests=true' + } + } + } + } + stage('Unit Tests') { + steps { + snDevOpsStep "60633729c7b333008c2c02b827c2601a" + //sh 'mvn surefire:test' + } + } + stage('Integration Tests') { + steps { + snDevOpsStep "e4633729c7b333008c2c02b827c26019" + sh 'mvn failsafe:integration-test' + junit 'target/surefire-reports/TEST-*.xml' + } + } + stage('Publishing Tests') { + //snDevOpsStep "ec633729c7b333008c2c02b827c26019" + parallel { + stage("Publish Junit") { + steps { + snDevOpsStep 'ec633729c7b333008c2c02b827c26019' + //snDevOpsChange() + //junit 'target/surefire-reports/TEST-*.xml' + } + } + stage("Publish Cucumber") { + steps { + snDevOpsStep 'ec633729c7b333008c2c02b827c26019' + cucumber "**/cucumber.json" + } + } + } + } + } } From 7de1a64eb4c6cdf763915f73313406f360561e07 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Wed, 11 Sep 2019 15:46:50 +0530 Subject: [PATCH 19/28] Updated with wrong test --- src/test/java/com/pik/contact/unit/ContactTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pik/contact/unit/ContactTest.java b/src/test/java/com/pik/contact/unit/ContactTest.java index 60e9fad..52c72e6 100644 --- a/src/test/java/com/pik/contact/unit/ContactTest.java +++ b/src/test/java/com/pik/contact/unit/ContactTest.java @@ -14,7 +14,7 @@ public void can_be_updated() { contact.updateWith(aContact("John", "Smith")); - assertThat(contact.getFullName()).isEqualTo("Smith"); + assertThat(contact.getFullName()).isEqualTo("Smith1"); } private Contact aContact(String name, String fullName) { From 10a5faceace1145b5ace888e24ffa0d1464013fc Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Fri, 13 Sep 2019 10:40:58 +0530 Subject: [PATCH 20/28] Updated Tests --- src/test/java/com/pik/contact/unit/ContactTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pik/contact/unit/ContactTest.java b/src/test/java/com/pik/contact/unit/ContactTest.java index 52c72e6..60e9fad 100644 --- a/src/test/java/com/pik/contact/unit/ContactTest.java +++ b/src/test/java/com/pik/contact/unit/ContactTest.java @@ -14,7 +14,7 @@ public void can_be_updated() { contact.updateWith(aContact("John", "Smith")); - assertThat(contact.getFullName()).isEqualTo("Smith1"); + assertThat(contact.getFullName()).isEqualTo("Smith"); } private Contact aContact(String name, String fullName) { From f68c2b6b1241e9fd05e24ec6a180a5d31f84d264 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Fri, 13 Sep 2019 10:43:15 +0530 Subject: [PATCH 21/28] Updated Tests --- src/test/java/com/pik/contact/cucumber/StepDefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pik/contact/cucumber/StepDefs.java b/src/test/java/com/pik/contact/cucumber/StepDefs.java index 593832c..081a63e 100644 --- a/src/test/java/com/pik/contact/cucumber/StepDefs.java +++ b/src/test/java/com/pik/contact/cucumber/StepDefs.java @@ -61,7 +61,7 @@ public void the_status_code_should_be(int code) throws Throwable { @Then("^it should have the field \"([^\"]*)\" containing the value \"([^\"]*)\"$") public void it_should_have_the_field_containing_the_value(String field, String value) throws Throwable { - mvcResult.andExpect(jsonPath("$." + field, is(value))); + mvcResult.andExpect(jsonPath("$." + field, is(123456))); } @Then("^it should have the field \"([^\"]*)\" containing the value (\\d+)$") From 552a8985547486876908594c3fec339c713afcbf Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Fri, 13 Sep 2019 10:46:04 +0530 Subject: [PATCH 22/28] Updated Test --- src/test/java/com/pik/contact/cucumber/StepDefs.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pik/contact/cucumber/StepDefs.java b/src/test/java/com/pik/contact/cucumber/StepDefs.java index 081a63e..279ee50 100644 --- a/src/test/java/com/pik/contact/cucumber/StepDefs.java +++ b/src/test/java/com/pik/contact/cucumber/StepDefs.java @@ -61,7 +61,7 @@ public void the_status_code_should_be(int code) throws Throwable { @Then("^it should have the field \"([^\"]*)\" containing the value \"([^\"]*)\"$") public void it_should_have_the_field_containing_the_value(String field, String value) throws Throwable { - mvcResult.andExpect(jsonPath("$." + field, is(123456))); + mvcResult.andExpect(jsonPath("$." + field, is("test"))); } @Then("^it should have the field \"([^\"]*)\" containing the value (\\d+)$") From 552bd2df22e69f0199f45b7444eceee2b62a48c4 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:36:03 +0530 Subject: [PATCH 23/28] First Change --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2048b9b..07b0b63 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,7 +45,7 @@ pipeline { stage("Publish Cucumber") { steps { snDevOpsStep 'ec633729c7b333008c2c02b827c26019' - cucumber "**/cucumber.json" + //cucumber "**/cucumber.json" } } } From 96e2232fbdb9e5e16127b0ac979ccbdbfa2f7081 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:36:39 +0530 Subject: [PATCH 24/28] Second Change --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 07b0b63..15d768a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,6 +46,7 @@ pipeline { steps { snDevOpsStep 'ec633729c7b333008c2c02b827c26019' //cucumber "**/cucumber.json" + echo "test" } } } From e536808759287218f5d2978fc05c55e66393a977 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Mon, 16 Sep 2019 17:36:57 +0530 Subject: [PATCH 25/28] Third change --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 15d768a..392085a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,8 +45,8 @@ pipeline { stage("Publish Cucumber") { steps { snDevOpsStep 'ec633729c7b333008c2c02b827c26019' - //cucumber "**/cucumber.json" - echo "test" + cucumber "**/cucumber.json" + //echo "test" } } } From c051628942cc1066b867e12db6dca7b33652ca35 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 17 Sep 2019 11:43:17 +0530 Subject: [PATCH 26/28] Updated Jenkins File --- Jenkinsfile | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 392085a..481ed20 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,53 +2,53 @@ pipeline { agent any stages { stage(Compile) { - parallel { - stage('Compile1') { + //parallel { + // stage('Compile1') { steps { - snDevOpsStep "e0633729c7b333008c2c02b827c2601a" + snDevOpsStep (stepSysId:'2decb637c73333008c2c02b827c2609c') sh 'mvn clean package -DskipTests=true' sh 'mvn surefire:test' junit 'target/surefire-reports/TEST-*.xml' } - } - stage('Compile2') { - steps { - snDevOpsStep "e0633729c7b333008c2c02b827c2601a" + // } + //stage('Compile2') { + // steps { + // snDevOpsStep (stepSysId:'2decb637c73333008c2c02b827c2609c') //sh 'mvn clean package -DskipTests=true' - } - } - } + //} + //} + //} } stage('Unit Tests') { steps { - snDevOpsStep "60633729c7b333008c2c02b827c2601a" - //sh 'mvn surefire:test' + snDevOpsStep (stepSysId:'a9ecb637c73333008c2c02b827c2609c') + sh 'mvn surefire:test' } } stage('Integration Tests') { steps { - snDevOpsStep "e4633729c7b333008c2c02b827c26019" + snDevOpsStep (stepSysId:'21ecb637c73333008c2c02b827c2609c') sh 'mvn failsafe:integration-test' junit 'target/surefire-reports/TEST-*.xml' } } stage('Publishing Tests') { //snDevOpsStep "ec633729c7b333008c2c02b827c26019" - parallel { - stage("Publish Junit") { + //parallel { + // stage("Publish Junit") { steps { - snDevOpsStep 'ec633729c7b333008c2c02b827c26019' + snDevOpsStep (stepSysId:'29ecb637c73333008c2c02b827c2609c') //snDevOpsChange() //junit 'target/surefire-reports/TEST-*.xml' } - } - stage("Publish Cucumber") { + //} + //stage("Publish Cucumber") { steps { - snDevOpsStep 'ec633729c7b333008c2c02b827c26019' + snDevOpsStep (stepSysId:'29ecb637c73333008c2c02b827c2609c') cucumber "**/cucumber.json" //echo "test" - } - } + // } + //} } } } From b0b71685d05283d357d78b185baf85897f2771c5 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 17 Sep 2019 11:50:16 +0530 Subject: [PATCH 27/28] Updated Jenkins File --- Jenkinsfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 481ed20..5c61ebf 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -36,11 +36,11 @@ pipeline { //snDevOpsStep "ec633729c7b333008c2c02b827c26019" //parallel { // stage("Publish Junit") { - steps { - snDevOpsStep (stepSysId:'29ecb637c73333008c2c02b827c2609c') + //steps { + // snDevOpsStep (stepSysId:'29ecb637c73333008c2c02b827c2609c') //snDevOpsChange() //junit 'target/surefire-reports/TEST-*.xml' - } + //} //} //stage("Publish Cucumber") { steps { From fdf7fa9f24b104bbb597e9cc21fcb704b599b9f5 Mon Sep 17 00:00:00 2001 From: MohanSairam423 <48183441+MohanSairam423@users.noreply.github.com> Date: Tue, 17 Sep 2019 13:41:01 +0530 Subject: [PATCH 28/28] Updated Jenkins File --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5c61ebf..7d9b1ad 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -45,6 +45,7 @@ pipeline { //stage("Publish Cucumber") { steps { snDevOpsStep (stepSysId:'29ecb637c73333008c2c02b827c2609c') + snDevOpsChange() cucumber "**/cucumber.json" //echo "test" // }