Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions precommit/src/main/shell/personality/hadoop.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -404,11 +403,36 @@ 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
if [ "$testtype" != "mvnsite" ] && [ "$testtype" != "shadedclient" ]; then
#shellcheck disable=SC2086
personality_enqueue_module hadoop-hdds ${extra}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shellcheck disable the message here. extra should have been an array but it wasn't when we first wrote yetus.

#shellcheck disable=SC2086
personality_enqueue_module hadoop-ozone ${extra}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same.

fi
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
Expand Down