adoroszlai opened a new pull request, #9906:
URL: https://github.com/apache/ozone/pull/9906
## What changes were proposed in this pull request?
Fix bad substitution in `hadoop-test.sh`. Steps to reproduce:
```bash
$ cd hadoop-ozone/dist/target/ozone-2.2.0-SNAPSHOT/compose/ozone
$ ./test-hadoop.sh
hadoop-ozone/dist/target/ozone-2.2.0-SNAPSHOT/compose/ozone/../common/hadoop-test.sh:
line 24: ${docker.hadoop.image}: bad substitution
hadoop-ozone/dist/target/ozone-2.2.0-SNAPSHOT/compose/ozone/../common/hadoop-test.sh:
line 30: HADOOP_IMAGE: unbound variable
```
It works in CI because `HADOOP_IMAGE` is defined elsewhere.
https://issues.apache.org/jira/browse/HDDS-14820
## How was this patch tested?
Verified that `docker.hadoop.image` is substituted at build time:
```diff
diff -uw hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
hadoop-ozone/dist/target/ozone-2.2.0-SNAPSHOT/compose/common/hadoop-test.sh
--- hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh 2026-03-11
08:45:18.473255547 +0100
+++
hadoop-ozone/dist/target/ozone-2.2.0-SNAPSHOT/compose/common/hadoop-test.sh
2026-03-11 08:46:24.200083915 +0100
@@ -21,20 +21,20 @@
fi
export
COMPOSE_FILE="${COMPOSE_FILE:-docker-compose.yaml}":../common/${extra_compose_file}
-DEFAULT_HADOOP_IMAGE="${docker.hadoop.image}"
+DEFAULT_HADOOP_IMAGE="ghcr.io/apache/hadoop"
: ${HADOOP_IMAGE:="${DEFAULT_HADOOP_IMAGE}"}
: ${HADOOP_TEST_IMAGES:=""}
if [[ -z "${HADOOP_TEST_IMAGES}" ]]; then
# hadoop2 image is only available from Docker Hub
- HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES}
apache/hadoop:${hadoop2.version}"
+ HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES} apache/hadoop:2.10.2"
HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES} ${HADOOP_IMAGE}:3.3.6"
- HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES}
${HADOOP_IMAGE}:${hadoop.version}${docker.hadoop.image.flavor}"
+ HADOOP_TEST_IMAGES="${HADOOP_TEST_IMAGES} ${HADOOP_IMAGE}:3.4.3"
fi
export HADOOP_MAJOR_VERSION=3
-export HADOOP_TEST_IMAGE="${HADOOP_IMAGE}:${hadoop.version}"
+export HADOOP_TEST_IMAGE="${HADOOP_IMAGE}:3.4.3"
export OZONE_REPLICATION_FACTOR=3
# shellcheck source=/dev/null
```
--
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]
