From fd619ba74fde3db7dea1f3fa249150ad2feceabf Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Wed, 21 Jul 2021 18:07:38 -0400
Subject: [PATCH 1/4] Add call to journalctl

---
 jenkinsScript.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jenkinsScript.sh b/jenkinsScript.sh
index ca31cf0ea64..f2abadf47df 100644
--- a/jenkinsScript.sh
+++ b/jenkinsScript.sh
@@ -51,6 +51,9 @@ function checkJavaVersion {
   fi
 }
 
+# Record start time in a format appropriate for journalctl --since
+start_time=$(date +"%Y-%m-%d %H:%M:%S")
+
 echo "WORKSPACE ${WORKSPACE}"
 
 checkEnvVars  \
@@ -123,4 +126,7 @@ helm repo update
 echo "Info: Run tests.."
 sh -x ./kindtest.sh -t "${IT_TEST}" -v ${KUBE_VERSION} -p ${PARALLEL_RUN} -d ${WDT_DOWNLOAD_URL} -i ${WIT_DOWNLOAD_URL} -x ${NUMBER_OF_THREADS} -m ${MAVEN_PROFILE_NAME}
 
+mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
+journalctl --utc --dmesg --system --since "$start_time" > "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results/journalctl.out"
+
 

From 72534ed34213a44f93add1ce3995ab544be4f7aa Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Thu, 22 Jul 2021 10:25:22 -0400
Subject: [PATCH 2/4] Collect journalctl logs from Kind nodes

---
 jenkinsScript.sh |  2 +-
 kindtest.sh      | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/jenkinsScript.sh b/jenkinsScript.sh
index f2abadf47df..543fa6fa0a6 100644
--- a/jenkinsScript.sh
+++ b/jenkinsScript.sh
@@ -127,6 +127,6 @@ echo "Info: Run tests.."
 sh -x ./kindtest.sh -t "${IT_TEST}" -v ${KUBE_VERSION} -p ${PARALLEL_RUN} -d ${WDT_DOWNLOAD_URL} -i ${WIT_DOWNLOAD_URL} -x ${NUMBER_OF_THREADS} -m ${MAVEN_PROFILE_NAME}
 
 mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
-journalctl --utc --dmesg --system --since "$start_time" > "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results/journalctl.out"
+journalctl --utc --dmesg --system --since "$start_time" > "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results/journalctl-compute.out"
 
 
diff --git a/kindtest.sh b/kindtest.sh
index 524cb7986c6..037730db88a 100755
--- a/kindtest.sh
+++ b/kindtest.sh
@@ -282,7 +282,11 @@ EOF
 echo 'Set up test running ENVVARs...'
 export KIND_REPO="localhost:${reg_port}/"
 export K8S_NODEPORT_HOST=`kubectl get node kind-worker -o jsonpath='{.status.addresses[?(@.type == "InternalIP")].address}'`
-export JAVA_HOME="${JAVA_HOME:-`type -p java|xargs readlink -f|xargs dirname|xargs dirname`}"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+  export JAVA_HOME=$(/usr/libexec/java_home)
+else
+  export JAVA_HOME="${JAVA_HOME:-`type -p java|xargs readlink -f|xargs dirname|xargs dirname`}"
+fi
 
 if [ "$skip_tests" = true ] ; then
   echo 'Cluster created. Skipping tests.'
@@ -309,3 +313,8 @@ else
     time mvn -Dit.test="${test_filter}, !ItOperatorWlsUpgrade, !ItFmwDomainInPVUsingWDT, !ItFmwDynamicDomainInPV, !ItDedicatedMode, !ItT3Channel, !ItOpUpgradeFmwDomainInPV, !ItOCILoadBalancer, !ItIstioCrossClusters*" -Dwdt.download.url="${wdt_download_url}" -Dwit.download.url="${wit_download_url}" -Dwle.download.url="${wle_download_url}" -DPARALLEL_CLASSES="${parallel_run}" -DNUMBER_OF_THREADS="${threads}" -pl integration-tests -P ${maven_profile_name} verify 2>&1 | tee "${RESULT_ROOT}/kindtest.log" || captureLogs
   fi
 fi
+
+echo "Collect journalctl logs"
+docker exec -it kind-worker journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-worker.out"
+docker exec -it kind-control-plane journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-control-plane.out"
+docker exec -it kind-registry journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-registry.out"

From 1a94a147da1564d96f64e89e5b8cc02b7732fff2 Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Thu, 22 Jul 2021 10:44:26 -0400
Subject: [PATCH 3/4] Remove -it

---
 kindtest.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/kindtest.sh b/kindtest.sh
index 037730db88a..fbbfe151a00 100755
--- a/kindtest.sh
+++ b/kindtest.sh
@@ -315,6 +315,6 @@ else
 fi
 
 echo "Collect journalctl logs"
-docker exec -it kind-worker journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-worker.out"
-docker exec -it kind-control-plane journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-control-plane.out"
-docker exec -it kind-registry journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-registry.out"
+docker exec kind-worker journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-worker.out"
+docker exec kind-control-plane journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-control-plane.out"
+docker exec kind-registry journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-registry.out"

From 783b14cda5678116b974dd36abe92ee566790fcd Mon Sep 17 00:00:00 2001
From: Ryan Eberhard <ryan.eberhard@oracle.com>
Date: Thu, 22 Jul 2021 10:54:25 -0400
Subject: [PATCH 4/4] No need for journalctl for registry

---
 kindtest.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/kindtest.sh b/kindtest.sh
index fbbfe151a00..a7e6c208340 100755
--- a/kindtest.sh
+++ b/kindtest.sh
@@ -317,4 +317,3 @@ fi
 echo "Collect journalctl logs"
 docker exec kind-worker journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-worker.out"
 docker exec kind-control-plane journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-control-plane.out"
-docker exec kind-registry journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-registry.out"