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 0c071ba HDDS-6167. Update ozone-runner version to 20211202-1 (#2969)
0c071ba is described below
commit 0c071ba8834807b0b341b04dce8a77c1c8e264e7
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Jan 19 19:43:56 2022 +0100
HDDS-6167. Update ozone-runner version to 20211202-1 (#2969)
---
hadoop-ozone/dist/pom.xml | 2 +-
hadoop-ozone/dist/src/main/dockerlibexec/entrypoint.sh | 2 +-
hadoop-ozone/dist/src/main/k8s/examples/testlib.sh | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hadoop-ozone/dist/pom.xml b/hadoop-ozone/dist/pom.xml
index 72ce7b7..8a098c7 100644
--- a/hadoop-ozone/dist/pom.xml
+++ b/hadoop-ozone/dist/pom.xml
@@ -28,7 +28,7 @@
<properties>
<file.encoding>UTF-8</file.encoding>
<downloadSources>true</downloadSources>
- <docker.ozone-runner.version>20210329-1</docker.ozone-runner.version>
+ <docker.ozone-runner.version>20211202-1</docker.ozone-runner.version>
<docker.ozone-testkr5b.image>apache/ozone-testkrb5:20210419-1</docker.ozone-testkr5b.image>
</properties>
diff --git a/hadoop-ozone/dist/src/main/dockerlibexec/entrypoint.sh
b/hadoop-ozone/dist/src/main/dockerlibexec/entrypoint.sh
index 7c0732e..65e709d 100755
--- a/hadoop-ozone/dist/src/main/dockerlibexec/entrypoint.sh
+++ b/hadoop-ozone/dist/src/main/dockerlibexec/entrypoint.sh
@@ -97,7 +97,7 @@ if [ -n "$KERBEROS_ENABLED" ]; then
sudo sed -i "s/krb5/$KERBEROS_SERVER/g" "/etc/krb5.conf" || true
fi
-CONF_DESTINATION_DIR="${HADOOP_CONF_DIR:-/opt/hadoop/etc/hadoop}"
+CONF_DESTINATION_DIR="${OZONE_CONF_DIR:-/opt/hadoop/etc/hadoop}"
#Try to copy the defaults
set +e
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
b/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
index 56eedd9..0ae44e4 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
+++ b/hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
@@ -116,7 +116,10 @@ regenerate_resources() {
OZONE_ROOT=$(realpath ../../..)
fi
- flekszible generate -t mount:hostPath="$OZONE_ROOT",path=/opt/hadoop -t
image:image=apache/ozone-runner:20200420-1 -t ozone/onenode
+ local default_version=${docker.ozone-runner.version} # set at build-time
from Maven property
+ local runner_version=${OZONE_RUNNER_VERSION:-${default_version}} # may be
specified by user running the test
+
+ flekszible generate -t mount:hostPath="$OZONE_ROOT",path=/opt/hadoop -t
image:image=apache/ozone-runner:${runner_version} -t ozone/onenode
}
revert_resources() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
