Skip to content

Commit 35a14d0

Browse files
authored
Add call to journalctl (#2475)
* Add calls to journalctl
1 parent c047931 commit 35a14d0

File tree

2 files changed

+15
-1
lines changed

2 files changed

+15
-1
lines changed

jenkinsScript.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ function checkJavaVersion {
5151
fi
5252
}
5353

54+
# Record start time in a format appropriate for journalctl --since
55+
start_time=$(date +"%Y-%m-%d %H:%M:%S")
56+
5457
echo "WORKSPACE ${WORKSPACE}"
5558

5659
checkEnvVars \
@@ -123,4 +126,7 @@ helm repo update
123126
echo "Info: Run tests.."
124127
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}
125128

129+
mkdir -m777 -p "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results"
130+
journalctl --utc --dmesg --system --since "$start_time" > "${WORKSPACE}/logdir/${BUILD_TAG}/wl_k8s_test_results/journalctl-compute.out"
131+
126132

kindtest.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,11 @@ EOF
282282
echo 'Set up test running ENVVARs...'
283283
export KIND_REPO="localhost:${reg_port}/"
284284
export K8S_NODEPORT_HOST=`kubectl get node kind-worker -o jsonpath='{.status.addresses[?(@.type == "InternalIP")].address}'`
285-
export JAVA_HOME="${JAVA_HOME:-`type -p java|xargs readlink -f|xargs dirname|xargs dirname`}"
285+
if [[ "$OSTYPE" == "darwin"* ]]; then
286+
export JAVA_HOME=$(/usr/libexec/java_home)
287+
else
288+
export JAVA_HOME="${JAVA_HOME:-`type -p java|xargs readlink -f|xargs dirname|xargs dirname`}"
289+
fi
286290

287291
if [ "$skip_tests" = true ] ; then
288292
echo 'Cluster created. Skipping tests.'
@@ -309,3 +313,7 @@ else
309313
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
310314
fi
311315
fi
316+
317+
echo "Collect journalctl logs"
318+
docker exec kind-worker journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-worker.out"
319+
docker exec kind-control-plane journalctl --utc --dmesg --system > "${RESULT_ROOT}/journalctl-kind-control-plane.out"

0 commit comments

Comments
 (0)