adoroszlai commented on code in PR #8236:
URL: https://github.com/apache/ozone/pull/8236#discussion_r2032465596
##########
hadoop-ozone/dist/src/main/compose/testlib.sh:
##########
@@ -216,22 +213,29 @@ execute_robot_test(){
fi
done
- SMOKETEST_DIR_INSIDE="${OZONE_DIR:-/opt/hadoop}/smoketest"
+ : ${OZONE_DIR:=/opt/hadoop}
+ SMOKETEST_DIR_INSIDE="$OZONE_DIR/smoketest"
+ RESULT_DIR_INSIDE="/tmp/smoketest/$COMPOSE_ENV_NAME/result"
OUTPUT_PATH="$RESULT_DIR_INSIDE/${OUTPUT_FILE}"
+ OM_HA_PARAM=""
+ if [[ -n "${OM_SERVICE_ID:-}" ]] && [[ "${OM_SERVICE_ID}" != "om" ]]; then
+ OM_HA_PARAM="--om-service-id=${OM_SERVICE_ID}"
+ fi
+
set +e
# shellcheck disable=SC2068
docker-compose exec -T "$CONTAINER" mkdir -p "$RESULT_DIR_INSIDE" \
&& docker-compose exec -T "$CONTAINER" robot \
- -v ENCRYPTION_KEY:"${OZONE_BUCKET_KEY_NAME}" \
+ -v ENCRYPTION_KEY:"${OZONE_BUCKET_KEY_NAME:-}" \
-v OM_HA_PARAM:"${OM_HA_PARAM}" \
-v OM_SERVICE_ID:"${OM_SERVICE_ID:-om}" \
-v OZONE_DIR:"${OZONE_DIR}" \
-v SECURITY_ENABLED:"${SECURITY_ENABLED}" \
-v SCM:"${SCM}" \
- ${ARGUMENTS[@]} --log NONE --report NONE "${OZONE_ROBOT_OPTS[@]}"
--output "$OUTPUT_PATH" \
Review Comment:
> was there a specific reason for dropping `${OZONE_ROBOT_OPTS[@]}`?
Being unused.
According to git history, it was introduced in HDDS-616, but was unused even
in that version of the code.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]