This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new ad07bcde8ee HDDS-14956. Add S3 HAProxy to
ozonesecure-ha/test-haproxy-s3g.sh (#10685)
ad07bcde8ee is described below
commit ad07bcde8ee24bf3e19f5c5827c7b10f27befac3
Author: Chi-Hsuan Huang <[email protected]>
AuthorDate: Thu Jul 9 00:21:41 2026 +0800
HDDS-14956. Add S3 HAProxy to ozonesecure-ha/test-haproxy-s3g.sh (#10685)
---
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh | 1 +
hadoop-ozone/dist/src/main/compose/testlib.sh | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
index 722aab772e2..23d56b22e93 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
@@ -25,6 +25,7 @@ export COMPOSE_DIR
export SECURITY_ENABLED=true
export OM_SERVICE_ID="omservice"
export SCM=scm1.org
+export COMPOSE_FILE=docker-compose.yaml:s3-haproxy.yaml
: ${OZONE_BUCKET_KEY_NAME:=key1}
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index 3c31de9b484..210b4bbf385 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -278,8 +278,8 @@ reorder_om_nodes() {
if [[ -n "${new_order}" ]] && [[ "${new_order}" != "om1,om2,om3" ]]; then
for c in $(docker-compose ps | cut -f1 -d' ' | grep -v -e '^NAME$' -e
'^om'); do
- docker exec "${c}" bash -c \
- "if [[ -f /etc/hadoop/ozone-site.xml ]]; then \
+ docker exec "${c}" sh -c \
+ "if [ -f /etc/hadoop/ozone-site.xml ]; then \
sed -i -e 's/om1,om2,om3/${new_order}/' /etc/hadoop/ozone-site.xml; \
echo 'Replaced OM order with ${new_order} in ${c}'; \
fi"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
