From 7915bbb2c0eeadb662cb6df3cd0f35f5bf8f3187 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Tue, 14 Jan 2020 14:06:51 -0500 Subject: [PATCH 01/23] Update MainPageIT.java --- src/test/java/integration/MainPageIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/integration/MainPageIT.java b/src/test/java/integration/MainPageIT.java index 6cd0cab98..0d28d4be1 100644 --- a/src/test/java/integration/MainPageIT.java +++ b/src/test/java/integration/MainPageIT.java @@ -12,7 +12,7 @@ import org.openqa.selenium.WebDriver; public class MainPageIT { private SeleniumConfig config; - private String url = "http://app-petclinic-dev.apps.cluster-ottawa-630b.ottawa-630b.example.opentlc.com/"; + private String url = "http://app-petclinic-dev.apps.cluster-ibm-4a7e.ibm-4a7e.example.opentlc.com/"; public MainPageIT() throws MalformedURLException { config = new SeleniumConfig(); From 90fe6ecf9f75233dcd580b2180512d4ba83644da Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Tue, 14 Jan 2020 14:07:08 -0500 Subject: [PATCH 02/23] Update SeleniumConfig.java --- src/test/java/integration/SeleniumConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/integration/SeleniumConfig.java b/src/test/java/integration/SeleniumConfig.java index ef856536a..9523b49fe 100644 --- a/src/test/java/integration/SeleniumConfig.java +++ b/src/test/java/integration/SeleniumConfig.java @@ -11,7 +11,7 @@ import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.remote.RemoteWebDriver; public class SeleniumConfig { - public static final String SELENIUM_HUB_URL = "http://selenium-hub-cicd.apps.cluster-ottawa-630b.ottawa-630b.example.opentlc.com/wd/hub"; + public static final String SELENIUM_HUB_URL = "http://selenium-hub-cicd.apps.cluster-ibm-4a7e.ibm-4a7e.example.opentlc.com/wd/hub"; private WebDriver firefoxDriver; private WebDriver chromeDriver; From 3ec20c3b751a4d86ad9acd48818e921f9c908afc Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Wed, 22 Jan 2020 07:29:20 -0500 Subject: [PATCH 03/23] Update MainPageIT.java --- src/test/java/integration/MainPageIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/integration/MainPageIT.java b/src/test/java/integration/MainPageIT.java index 0d28d4be1..09843a11e 100644 --- a/src/test/java/integration/MainPageIT.java +++ b/src/test/java/integration/MainPageIT.java @@ -12,7 +12,7 @@ import org.openqa.selenium.WebDriver; public class MainPageIT { private SeleniumConfig config; - private String url = "http://app-petclinic-dev.apps.cluster-ibm-4a7e.ibm-4a7e.example.opentlc.com/"; + private String url = "http://app-petclinic-dev.apps.cluster-ottawa-7ca3.ottawa-7ca3.example.opentlc.com/"; public MainPageIT() throws MalformedURLException { config = new SeleniumConfig(); From 2a8ebabf4495d8a3d6bffb05d49b7981a2d5147f Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Wed, 22 Jan 2020 07:29:39 -0500 Subject: [PATCH 04/23] Update SeleniumConfig.java --- src/test/java/integration/SeleniumConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/integration/SeleniumConfig.java b/src/test/java/integration/SeleniumConfig.java index 9523b49fe..c69ce9b7b 100644 --- a/src/test/java/integration/SeleniumConfig.java +++ b/src/test/java/integration/SeleniumConfig.java @@ -11,7 +11,7 @@ import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.remote.RemoteWebDriver; public class SeleniumConfig { - public static final String SELENIUM_HUB_URL = "http://selenium-hub-cicd.apps.cluster-ibm-4a7e.ibm-4a7e.example.opentlc.com/wd/hub"; + public static final String SELENIUM_HUB_URL = "http://selenium-hub-cicd.apps.cluster-ottawa-7ca3.ottawa-7ca3.example.opentlc.com/wd/hub"; private WebDriver firefoxDriver; private WebDriver chromeDriver; From 505cfe0728df8d5ecbf7272810118c99aec1e0ee Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Mon, 27 Jan 2020 17:40:26 -0500 Subject: [PATCH 05/23] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6fe39c1c6..33114a16b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -86,7 +86,7 @@ pipeline { stage('Integration Tests') { steps { echo "Running Integration tests..." - sh "mvn verify -Pfailsafe" + // sh "mvn verify -Pfailsafe" } } stage('Tag UAT') { From 426858e5cab6efc31d2f504d44e2ef1bc6f95192 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Thu, 13 Feb 2020 14:09:01 -0500 Subject: [PATCH 06/23] Delete TestJenkinsfile --- TestJenkinsfile | 70 ------------------------------------------------- 1 file changed, 70 deletions(-) delete mode 100644 TestJenkinsfile diff --git a/TestJenkinsfile b/TestJenkinsfile deleted file mode 100644 index c6ec9371b..000000000 --- a/TestJenkinsfile +++ /dev/null @@ -1,70 +0,0 @@ -try { - def appName=env.APP_NAME - def gitSourceUrl=env.GIT_SOURCE_URL - def gitSourceRef=env.GIT_SOURCE_REF - def project="" - def projectVersion="" - - node('jenkins-slave-skopeo') { - - def quayUser=env.QUAY_USER - def quayPassword=env.QUAY_PASS - def ocpUser=env.OCP_USER - def ocpPassword=env.OCP_PASS - - stage('Clair Container Vulnerability Scan') { - echo "Printing ocp and quay users:" - echo "OCP: ${ocpUser}" - echo "OCP from env: ${env.OCP_USER}" - echo "Quay: ${quayUser}" - echo "Git repo: ${gitSourceUrl}" - - sh "oc login -u $ocpUser -p $ocpPassword --insecure-skip-tls-verify https://api.cluster-ottawa-7b89.ottawa-7b89.example.opentlc.com:6443 2>&1" - sh 'skopeo --debug copy --src-creds="$(oc whoami)":"$(oc whoami -t)" --src-tls-verify=false --dest-tls-verify=false' + " --dest-creds=$quayUser:$quayPassword docker://docker-registry.default.svc:5000/cicd/petclinic:latest docker://quay.io/$quayUser/petclinic:latest" - } - - stage("Tag DEV") { - echo "Tag image to DEV" - openshift.withCluster() { - openshift.withProject('cicd') { - openshift.tag("${appName}:latest", "${appName}:dev") - } - } - } - stage("Deploy DEV") { - echo "Deploy to DEV." - openshift.withCluster() { - openshift.withProject("${appName}-dev") { - echo "Rolling out to DEV." - def dc = openshift.selector('dc', "${appName}") - dc.rollout().latest() - dc.rollout().status() - } - } - } - stage("Tag for QA") { - echo "Tag to UAT" - openshift.withCluster() { - openshift.withProject('cicd') { - openshift.tag("${appName}:dev", "${appName}:uat") - } - } - } - stage("Deploy UAT") { - echo "Deploy to UAT." - openshift.withCluster() { - openshift.withProject("${appName}-uat") { - echo "Rolling out to UAT." - def dc = openshift.selector('dc', "${appName}") - dc.rollout().latest() - dc.rollout().status() - } - } - } - } -} catch (err) { - echo "in catch block" - echo "Caught: ${err}" - currentBuild.result = 'FAILURE' - throw err -} From 89083706c88b95c12b52b310dc7a5e51c92c546a Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Wed, 11 Mar 2020 08:06:56 -0400 Subject: [PATCH 07/23] Update MainPageIT.java --- src/test/java/integration/MainPageIT.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/integration/MainPageIT.java b/src/test/java/integration/MainPageIT.java index 09843a11e..591f68975 100644 --- a/src/test/java/integration/MainPageIT.java +++ b/src/test/java/integration/MainPageIT.java @@ -12,7 +12,7 @@ import org.openqa.selenium.WebDriver; public class MainPageIT { private SeleniumConfig config; - private String url = "http://app-petclinic-dev.apps.cluster-ottawa-7ca3.ottawa-7ca3.example.opentlc.com/"; + private String url = "http://app-petclinic-dev.apps.ocp.pitt.ca/"; public MainPageIT() throws MalformedURLException { config = new SeleniumConfig(); From 736d85df597f9a65bdc382e44f542529ccc5863f Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Wed, 11 Mar 2020 08:07:41 -0400 Subject: [PATCH 08/23] Update SeleniumConfig.java --- src/test/java/integration/SeleniumConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/integration/SeleniumConfig.java b/src/test/java/integration/SeleniumConfig.java index c69ce9b7b..7e2062f99 100644 --- a/src/test/java/integration/SeleniumConfig.java +++ b/src/test/java/integration/SeleniumConfig.java @@ -11,7 +11,7 @@ import org.openqa.selenium.firefox.FirefoxOptions; import org.openqa.selenium.remote.RemoteWebDriver; public class SeleniumConfig { - public static final String SELENIUM_HUB_URL = "http://selenium-hub-cicd.apps.cluster-ottawa-7ca3.ottawa-7ca3.example.opentlc.com/wd/hub"; + public static final String SELENIUM_HUB_URL = "http://selenium-hub-cicd.apps.ocp.pitt.ca/wd/hub"; private WebDriver firefoxDriver; private WebDriver chromeDriver; From c01eaac3b35e3c0568556e2388dedd876f260da0 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 10:46:34 -0400 Subject: [PATCH 09/23] Update pom.xml --- pom.xml | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/pom.xml b/pom.xml index d84daff06..fae87de21 100644 --- a/pom.xml +++ b/pom.xml @@ -267,26 +267,6 @@ - - - nexus - Nexus - http://nexus.cicd.svc.cluster.local:8081/content/groups/public - - true - - - - - - nexus - Nexus - http://nexus.cicd.svc.cluster.local:8081/content/groups/public - - true - - - From eeb2db9f65fb7d3957544fc38a2e0f155d215916 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 10:47:24 -0400 Subject: [PATCH 10/23] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fae87de21..2463b9144 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.springframework.samples + ca.pitt.demo.petclinic spring-petclinic - 2.1.0.BUILD-SNAPSHOT + 2.1.0-SNAPSHOT org.springframework.boot From 1956d056044107c06b785847803daa0c3d37042b Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 11:26:20 -0400 Subject: [PATCH 11/23] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2463b9144..da11ead42 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 ca.pitt.demo.petclinic spring-petclinic - 2.1.0-SNAPSHOT + 1.0.0-SNAPSHOT org.springframework.boot From 78cc21d03eff9a34ed53ebf485f8a9047ceaf595 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 11:28:47 -0400 Subject: [PATCH 12/23] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index da11ead42..fae87de21 100644 --- a/pom.xml +++ b/pom.xml @@ -3,9 +3,9 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - ca.pitt.demo.petclinic + org.springframework.samples spring-petclinic - 1.0.0-SNAPSHOT + 2.1.0.BUILD-SNAPSHOT org.springframework.boot From a941248e9d18664ab68919bcc804a0463417288b Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 11:33:24 -0400 Subject: [PATCH 13/23] Update pom.xml --- pom.xml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pom.xml b/pom.xml index fae87de21..d84daff06 100644 --- a/pom.xml +++ b/pom.xml @@ -267,6 +267,26 @@ + + + nexus + Nexus + http://nexus.cicd.svc.cluster.local:8081/content/groups/public + + true + + + + + + nexus + Nexus + http://nexus.cicd.svc.cluster.local:8081/content/groups/public + + true + + + From a6299c037f24dc467d07ae637f17f783a0b37393 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 11:37:30 -0400 Subject: [PATCH 14/23] Update pom.xml --- pom.xml | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/pom.xml b/pom.xml index d84daff06..217d2041a 100644 --- a/pom.xml +++ b/pom.xml @@ -267,26 +267,4 @@ - - - nexus - Nexus - http://nexus.cicd.svc.cluster.local:8081/content/groups/public - - true - - - - - - - nexus - Nexus - http://nexus.cicd.svc.cluster.local:8081/content/groups/public - - true - - - - From 5fa9b9e91390887363678ac6896b1593ed422161 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 11:57:08 -0400 Subject: [PATCH 15/23] Update pom.xml --- pom.xml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/pom.xml b/pom.xml index 217d2041a..b6df66ef5 100644 --- a/pom.xml +++ b/pom.xml @@ -259,6 +259,31 @@ + + + nexus + http://nexus.cicd.svc.cluster.local:8081/content/groups/public + + + + + + nexus + http://nexus.cicd.svc.cluster.local:8081/content/groups/public + + + + + + nexus-snapshots + nexus.cicd.svc.cluster.local:8081/content/repositories/snapshots/ + + + nexus-releases + nexus.cicd.svc.cluster.local:8081/content/repositories/releases/ + + + From 52277df98349a11d7efb6fec9f04f7af9f2ce758 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 12:01:54 -0400 Subject: [PATCH 16/23] Update pom.xml --- pom.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pom.xml b/pom.xml index b6df66ef5..df6415398 100644 --- a/pom.xml +++ b/pom.xml @@ -53,10 +53,6 @@ org.springframework.boot spring-boot-starter-thymeleaf - - org.springframework.boot - spring-boot-starter-actuator - org.springframework.boot spring-boot-starter-test From 5595073a451b1a43abb654839c3fe4c0809bdaf9 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 12:07:34 -0400 Subject: [PATCH 17/23] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index df6415398..2941fe2f0 100644 --- a/pom.xml +++ b/pom.xml @@ -272,11 +272,11 @@ nexus-snapshots - nexus.cicd.svc.cluster.local:8081/content/repositories/snapshots/ + nexus.cicd.svc.cluster.local:8081/nexus/content/repositories/snapshots nexus-releases - nexus.cicd.svc.cluster.local:8081/content/repositories/releases/ + nexus.cicd.svc.cluster.local:8081/nexus/content/repositories/releases From 5d2162d28611da4891487f5b8430ee23dff76d44 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 12:20:40 -0400 Subject: [PATCH 18/23] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 2941fe2f0..66c089247 100644 --- a/pom.xml +++ b/pom.xml @@ -272,11 +272,11 @@ nexus-snapshots - nexus.cicd.svc.cluster.local:8081/nexus/content/repositories/snapshots + http://nexus.cicd.svc.cluster.local:8081/content/repositories/snapshots nexus-releases - nexus.cicd.svc.cluster.local:8081/nexus/content/repositories/releases + http://nexus.cicd.svc.cluster.local:8081/content/repositories/releases From 7fca38c46c53709436246414d370f1a7e411ca30 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 12:39:58 -0400 Subject: [PATCH 19/23] Update pom.xml --- pom.xml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 66c089247..7da00186e 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,11 @@ 2.2.4 1.8.0 - 0.8.2 + jacoco + reuseReports + ${project.basedir}/../target/jacoco.exec + java + 0.8.5 @@ -158,7 +162,11 @@ - + + org.sonarsource.scanner.maven + sonar-maven-plugin + 3.7.0.1746 + From 7ed0365b832fb3366e495beb4bcbac5fe155aa0f Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 13:03:04 -0400 Subject: [PATCH 20/23] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7da00186e..62bc91cd4 100644 --- a/pom.xml +++ b/pom.xml @@ -165,7 +165,7 @@ org.sonarsource.scanner.maven sonar-maven-plugin - 3.7.0.1746 + 3.5.0.1254 From 58db113ce653392edd9f8b1681d79a3bd0286453 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 17:15:03 -0400 Subject: [PATCH 21/23] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 62bc91cd4..668576520 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,7 @@ app + ${outputDirectory} org.springframework.boot From 3e5f9d4b055d3bae07c6117d7f9cc06ceec3cdd0 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 17:45:25 -0400 Subject: [PATCH 22/23] Update pom.xml --- pom.xml | 46 +++++++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index 668576520..7202278bc 100644 --- a/pom.xml +++ b/pom.xml @@ -123,27 +123,6 @@ app ${outputDirectory} - - org.springframework.boot - spring-boot-maven-plugin - - - - - build-info - - - - ${project.build.sourceEncoding} - ${project.reporting.outputEncoding} - ${maven.compiler.source} - ${maven.compiler.target} - - - - - org.jacoco jacoco-maven-plugin @@ -163,6 +142,31 @@ + + org.apache.maven.plugins + maven-assembly-plugin + 3.2.0 + + + package + + single + + + + + + org.springframework.samples.petclinic.PetClinicApplication + + + + + jar-with-dependencies + + + + + org.sonarsource.scanner.maven sonar-maven-plugin From 19609cf07684261dd59f8e4be46669285c73f269 Mon Sep 17 00:00:00 2001 From: Andrew Pitt Date: Fri, 13 Mar 2020 22:56:12 -0400 Subject: [PATCH 23/23] Update pom.xml --- pom.xml | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/pom.xml b/pom.xml index 7202278bc..2b9572573 100644 --- a/pom.xml +++ b/pom.xml @@ -123,25 +123,6 @@ app ${outputDirectory} - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - prepare-package - - report - - - - org.apache.maven.plugins maven-assembly-plugin