From 5d5081eff8e898b5f16481dd87891c11763a0ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Elek=2C=20M=C3=A1rton?= Date: Tue, 4 Jun 2019 08:30:43 +0200 Subject: [PATCH] HDDS-1631. Fix auditparser smoketests (#892) --- hadoop-ozone/dist/src/main/compose/ozone/test.sh | 2 +- .../dist/src/main/smoketest/auditparser/auditparser.robot | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh b/hadoop-ozone/dist/src/main/compose/ozone/test.sh index 1c90175195..f36fb48dfb 100755 --- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh +++ b/hadoop-ozone/dist/src/main/compose/ozone/test.sh @@ -26,7 +26,7 @@ start_docker_env #Due to the limitation of the current auditparser test, it should be the #first test in a clean cluster. -execute_robot_test scm auditparser +execute_robot_test om auditparser execute_robot_test scm basic/basic.robot diff --git a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot b/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot index a4b0b7a478..30790ec5e4 100644 --- a/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot +++ b/hadoop-ozone/dist/src/main/smoketest/auditparser/auditparser.robot @@ -36,8 +36,9 @@ Initiating freon to generate data Should Not Contain ${result} ERROR Testing audit parser - ${logfile} = Execute ls -t /opt/hadoop/logs | grep om-audit | head -1 - Execute ozone auditparser /opt/hadoop/audit.db load "/opt/hadoop/logs/${logfile}" + ${logdir} = Get Environment Variable HADOOP_LOG_DIR /var/log/hadoop + ${logfile} = Execute ls -t "${logdir}" | grep om-audit | head -1 + Execute ozone auditparser /opt/hadoop/audit.db load "${logdir}/${logfile}" ${result} = Execute ozone auditparser /opt/hadoop/audit.db template top5cmds Should Contain ${result} ALLOCATE_KEY ${result} = Execute ozone auditparser /opt/hadoop/audit.db template top5users