Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HDDS-6167. Update ozone-runner version to 20211202-1 #2969

Merged
merged 2 commits into from Jan 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/pom.xml
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion hadoop-ozone/dist/src/main/dockerlibexec/entrypoint.sh
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion hadoop-ozone/dist/src/main/k8s/examples/testlib.sh
Expand Up @@ -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() {
Expand Down