From c5940b4df315fe9405aca89284d07b23601eae87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Tue, 5 Mar 2019 10:23:26 +0100 Subject: [PATCH 1/3] adjustments to build all the ozone/hdds projects in case of an ozone change --- .../src/main/shell/personality/hadoop.sh | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/precommit/src/main/shell/personality/hadoop.sh b/precommit/src/main/shell/personality/hadoop.sh index 7c8b5301d..5529be1ca 100755 --- a/precommit/src/main/shell/personality/hadoop.sh +++ b/precommit/src/main/shell/personality/hadoop.sh @@ -404,11 +404,32 @@ function personality_modules fi extra="-Ptest-patch ${extra}" - - for module in $(hadoop_order ${ordering}); do - # shellcheck disable=SC2086 - personality_enqueue_module ${module} ${extra} + OZONE_CHANGED=false + CORE_HADOOP_CHANGED=false + for module in $CHANGED_MODULES + do + if [[ "$module" =~ "hdds" ]]; then + OZONE_CHANGED=true + elif [[ "$module" =~ "ozone" ]]; then + OZONE_CHANGED=true + else + CORE_HADOOP_CHANGED=true + fi done + + if [ "$OZONE_CHANGED" = true ]; then + extra="-Phdds ${extra}" + fi + + if [ "$CORE_HADOOP_CHANGED" = false ] && [ "$OZONE_CHANGED" = true ]; then + personality_enqueue_module hadoop-hdds ${extra} + personality_enqueue_module hadoop-ozone ${extra} + else + for module in $(hadoop_order ${ordering}); do + # shellcheck disable=SC2086 + personality_enqueue_module ${module} ${extra} + done + fi } ## @description Add tests based upon personality needs From aa1d558af61e98a14e5e1027517e01d9e57c6a66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Tue, 5 Mar 2019 15:07:45 +0100 Subject: [PATCH 2/3] disable shadedclient and mvnsite for ozone only tests --- precommit/src/main/shell/personality/hadoop.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/precommit/src/main/shell/personality/hadoop.sh b/precommit/src/main/shell/personality/hadoop.sh index 5529be1ca..1db904a24 100755 --- a/precommit/src/main/shell/personality/hadoop.sh +++ b/precommit/src/main/shell/personality/hadoop.sh @@ -422,8 +422,10 @@ function personality_modules fi if [ "$CORE_HADOOP_CHANGED" = false ] && [ "$OZONE_CHANGED" = true ]; then - personality_enqueue_module hadoop-hdds ${extra} - personality_enqueue_module hadoop-ozone ${extra} + if [ "$testtype" != "mvnsite" ] && [ "$testtype" != "shadedclient" ]; then + personality_enqueue_module hadoop-hdds ${extra} + personality_enqueue_module hadoop-ozone ${extra} + fi else for module in $(hadoop_order ${ordering}); do # shellcheck disable=SC2086 From 3b8f4058443eb87fced6444391612c43a5e5160c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A1rton=20Elek?= Date: Thu, 7 Mar 2019 15:07:13 +0100 Subject: [PATCH 3/3] fixing iteration on array + ignore shellcheck errors --- precommit/src/main/shell/personality/hadoop.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/precommit/src/main/shell/personality/hadoop.sh b/precommit/src/main/shell/personality/hadoop.sh index 1db904a24..5715c31f7 100755 --- a/precommit/src/main/shell/personality/hadoop.sh +++ b/precommit/src/main/shell/personality/hadoop.sh @@ -18,7 +18,6 @@ # SHELLDOC-IGNORE # # Override these to match Apache Hadoop's requirements - personality_plugins "all,-ant,-gradle,-scalac,-scaladoc" ## @description Globals specific to this personality @@ -406,7 +405,7 @@ function personality_modules extra="-Ptest-patch ${extra}" OZONE_CHANGED=false CORE_HADOOP_CHANGED=false - for module in $CHANGED_MODULES + for module in "${CHANGED_MODULES[@]}" do if [[ "$module" =~ "hdds" ]]; then OZONE_CHANGED=true @@ -423,7 +422,9 @@ function personality_modules if [ "$CORE_HADOOP_CHANGED" = false ] && [ "$OZONE_CHANGED" = true ]; then if [ "$testtype" != "mvnsite" ] && [ "$testtype" != "shadedclient" ]; then + #shellcheck disable=SC2086 personality_enqueue_module hadoop-hdds ${extra} + #shellcheck disable=SC2086 personality_enqueue_module hadoop-ozone ${extra} fi else