From d663c644e356962a36ee49abb5862f8b438496a5 Mon Sep 17 00:00:00 2001
From: Derek Sharpe <derek.sharpe@oracle.com>
Date: Fri, 18 Oct 2019 15:40:20 -0500
Subject: [PATCH 1/5] enable system tests for Jenkins build

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7d2b8be0af..29a6c4b19d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -22,13 +22,13 @@ pipeline {
         stage ('Build') {
             steps {
                 sh '''
-                    mvn -B -DskipTests -Dunit-test-wlst-dir=${WLST_DIR} clean package
+                    mvn -B -DskipTests clean package
                 '''
             }
         }
         stage ('Verify') {
             steps {
-                sh 'mvn -Dunit-test-wlst-dir=${WLST_DIR} -Dmw_home=${ORACLE_HOME} verify'
+                sh 'mvn -P system-test -Dunit-test-wlst-dir=${WLST_DIR} -Dmw_home=${ORACLE_HOME} verify'
             }
             post {
                 always {

From 1cee108ac2503b1819ca9fd5d04e35e9db3271a0 Mon Sep 17 00:00:00 2001
From: Derek Sharpe <derek.sharpe@oracle.com>
Date: Fri, 18 Oct 2019 15:47:01 -0500
Subject: [PATCH 2/5] run system test on pull request, and run unit test always
 on Jenkins

---
 Jenkinsfile | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index 29a6c4b19d..c8b73abfb7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,7 +26,20 @@ pipeline {
                 '''
             }
         }
+        stage ('Test') {
+            steps {
+                sh 'mvn -Dunit-test-wlst-dir=${WLST_DIR} test'
+            }
+            post {
+                always {
+                    junit 'imagetool/target/surefire-reports/*.xml'
+                }
+            }
+        }
         stage ('Verify') {
+            when {
+                changeRequest()
+            }
             steps {
                 sh 'mvn -P system-test -Dunit-test-wlst-dir=${WLST_DIR} -Dmw_home=${ORACLE_HOME} verify'
             }

From 939f9ae59b6e0a704a6e8c63a15b8fbf16dba457 Mon Sep 17 00:00:00 2001
From: Derek Sharpe <derek.sharpe@oracle.com>
Date: Fri, 18 Oct 2019 15:51:15 -0500
Subject: [PATCH 3/5] junit directory cut-paste error

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c8b73abfb7..33cd957c1d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@ pipeline {
             }
             post {
                 always {
-                    junit 'imagetool/target/surefire-reports/*.xml'
+                    junit 'core/target/surefire-reports/*.xml'
                 }
             }
         }
@@ -45,7 +45,7 @@ pipeline {
             }
             post {
                 always {
-                    junit 'core/target/surefire-reports/*.xml'
+                    junit 'core/target/failsafe-reports/*.xml'
                 }
             }
         }

From 9ca096b7fc942175bf2fc09896a82d20a1c7e437 Mon Sep 17 00:00:00 2001
From: Derek Sharpe <derek.sharpe@oracle.com>
Date: Fri, 18 Oct 2019 16:22:03 -0500
Subject: [PATCH 4/5] still trying to run only system test and not rerun unit
 tests

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 33cd957c1d..f349b21d16 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,7 @@ pipeline {
                 changeRequest()
             }
             steps {
-                sh 'mvn -P system-test -Dunit-test-wlst-dir=${WLST_DIR} -Dmw_home=${ORACLE_HOME} verify'
+                sh 'mvn -P system-test -Dmw_home=${ORACLE_HOME} test-compile failsafe:integration-test'
             }
             post {
                 always {

From 8f541cc0abef51c46139a175aa7c9ddf429a0651 Mon Sep 17 00:00:00 2001
From: Derek Sharpe <derek.sharpe@oracle.com>
Date: Fri, 18 Oct 2019 17:14:39 -0500
Subject: [PATCH 5/5] correct directory of failsafe reports in Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f349b21d16..ccf4439d12 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -45,7 +45,7 @@ pipeline {
             }
             post {
                 always {
-                    junit 'core/target/failsafe-reports/*.xml'
+                    junit 'system-test/target/failsafe-reports/*.xml'
                 }
             }
         }