From 65075982e4d13b5986ed55ec7265c066f89f7ccd Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 4 Nov 2024 16:39:06 +0100
Subject: [PATCH 1/2] HDDS-11641. Allow testing Hadoop with custom docker
 images

---
 .../dist/src/main/compose/common/hadoop-test.sh      | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
index 4b66baca4226..b4ab5993821d 100755
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
@@ -21,6 +21,8 @@ if [[ ${SECURITY_ENABLED} == "true" ]]; then
 fi
 export COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yaml}":../common/${extra_compose_file}
 
+: ${HADOOP_TEST_VERSIONS:="apache/hadoop:${hadoop2.version} flokkr/hadoop:3.1.2 apache/hadoop:${hadoop.version}"}
+
 export HADOOP_MAJOR_VERSION=3
 export HADOOP_VERSION=unused # will be set for each test version below
 export OZONE_REPLICATION_FACTOR=3
@@ -42,14 +44,10 @@ export OZONE_DIR=/opt/ozone
 # shellcheck source=/dev/null
 source "$COMPOSE_DIR/../testlib.sh"
 
-for HADOOP_VERSION in ${hadoop2.version} 3.1.2 ${hadoop.version}; do
-  export HADOOP_VERSION
+for test_version in $HADOOP_TEST_VERSIONS; do
+  export HADOOP_IMAGE="${test_version%%:*}"
+  export HADOOP_VERSION="${test_version##*:}"
   export HADOOP_MAJOR_VERSION=${HADOOP_VERSION%%.*}
-  if [[ "${HADOOP_VERSION}" == "${hadoop2.version}" ]] || [[ "${HADOOP_VERSION}" == "${hadoop.version}" ]]; then
-    export HADOOP_IMAGE=apache/hadoop
-  else
-    export HADOOP_IMAGE=flokkr/hadoop
-  fi
 
   docker-compose --ansi never --profile hadoop up -d nm rm
 

From 7c978676ff567ac62d0fab6c2bc3a5def4f6419d Mon Sep 17 00:00:00 2001
From: "Doroszlai, Attila" <adoroszlai@apache.org>
Date: Mon, 4 Nov 2024 19:44:55 +0100
Subject: [PATCH 2/2] add temporary variables, one replacement per line

---
 hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
index b4ab5993821d..7bf56074437e 100755
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
@@ -21,7 +21,11 @@ if [[ ${SECURITY_ENABLED} == "true" ]]; then
 fi
 export COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yaml}":../common/${extra_compose_file}
 
-: ${HADOOP_TEST_VERSIONS:="apache/hadoop:${hadoop2.version} flokkr/hadoop:3.1.2 apache/hadoop:${hadoop.version}"}
+# need temp variables because maven filtering replaces only one item per line
+hadoop2_version="${hadoop2.version}"
+hadoop_version="${hadoop.version}"
+
+: ${HADOOP_TEST_VERSIONS:="apache/hadoop:${hadoop2_version} flokkr/hadoop:3.1.2 apache/hadoop:${hadoop_version}"}
 
 export HADOOP_MAJOR_VERSION=3
 export HADOOP_VERSION=unused # will be set for each test version below