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 79d2f0b641e HDDS-15229. Allow running acceptance test with local-only
image (#10234)
79d2f0b641e is described below
commit 79d2f0b641e54c62008843a30457b9c8444133a5
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue May 12 17:34:36 2026 +0200
HDDS-15229. Allow running acceptance test with local-only image (#10234)
---
hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 6 +++++-
hadoop-ozone/dist/src/main/compose/testlib.sh | 4 +++-
2 files changed, 8 insertions(+), 2 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 ae1b8545820..2c382ce9dee 100755
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
@@ -56,10 +56,14 @@ source "$COMPOSE_DIR/../testlib.sh"
for HADOOP_TEST_IMAGE in $HADOOP_TEST_IMAGES; do
export HADOOP_TEST_IMAGE
+
+ if [[ "${CI:-}" == "true" ]]; then
+ retry docker-compose --ansi never --profile hadoop pull nm rm || true
+ fi
+
hadoop_version=$(docker run --rm "${HADOOP_TEST_IMAGE}" bash -c "hadoop
version | grep -m1 '^Hadoop' | cut -f2 -d' '")
export HADOOP_MAJOR_VERSION=${hadoop_version%%.*}
- retry docker-compose --ansi never --profile hadoop pull nm rm
docker-compose --ansi never --profile hadoop up -d nm rm
execute_command_in_container rm hadoop version
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index eb3ede6f47a..903fdad7de3 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -179,7 +179,9 @@ start_docker_env(){
docker-compose --ansi never down --remove-orphans
- retry docker-compose --ansi never pull
+ if [[ "${CI:-}" == "true" ]]; then
+ retry docker-compose --ansi never pull || true
+ fi
opts=""
if has_scalable_datanode; then
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
