This is an automated email from the ASF dual-hosted git repository.
weichiu 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 8e7d370ebf HDDS-12666. Remove -SNAPSHOT from OZONE_CURRENT_VERSION in
upgrade test (#8136)
8e7d370ebf is described below
commit 8e7d370ebf00e3972a5b975a496cd4e91c8411af
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Mon Mar 24 22:16:19 2025 +0100
HDDS-12666. Remove -SNAPSHOT from OZONE_CURRENT_VERSION in upgrade test
(#8136)
---
hadoop-ozone/dist/src/main/compose/testlib.sh | 3 +++
hadoop-ozone/dist/src/main/compose/upgrade/README.md | 5 ++---
hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 1 -
hadoop-ozone/dist/src/main/compose/xcompat/lib.sh | 3 +--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index 19deb3b189..0f274b3d85 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -33,6 +33,9 @@ source "${_testlib_dir}/../smoketest/testlib.sh"
: ${OZONE_COMPOSE_RUNNING:=false}
: ${SCM:=scm}
+# version is used in bucket name, which does not allow uppercase
+export OZONE_CURRENT_VERSION="$(echo "${ozone.version}" | sed -e
's/-SNAPSHOT//' | tr '[:upper:]' '[:lower:]')"
+
# create temp directory for test data; only once, even if testlib.sh is
sourced again
if [[ -z "${TEST_DATA_DIR:-}" ]] && [[ "${KEEP_RUNNING:-false}" == "false" ]];
then
export TEST_DATA_DIR="$(mktemp -d "${TMPDIR:-/tmp}"/robot-data-XXXXXX)"
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/README.md
b/hadoop-ozone/dist/src/main/compose/upgrade/README.md
index 345b91d7bd..05920533bc 100644
--- a/hadoop-ozone/dist/src/main/compose/upgrade/README.md
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/README.md
@@ -27,9 +27,8 @@ an older release of Ozone and a later release (which may be
the local build).
- To do this, uncomment all lines that contain `run_test` in the *test.sh*
file, and execute *test.sh* either locally or on GitHub actions.
2. After the release is finished and its docker image is published, add the
new version to the test matrix.
- 1. Change the `OZONE_CURRENT_VERSION` variable to
`OZONE_CURRENT_VERSION=<newly-released-version>`.
- 2. Comment out all `run_test` lines in *test.sh*.
- 3. Add a new line: `run_test ha non-rolling-upgrade
<newly-released-version> "$OZONE_CURRENT_VERSION"` before the commented out
lines.
+ 1. Comment out all `run_test` lines in *test.sh*.
+ 2. Add a new line: `run_test ha non-rolling-upgrade
<newly-released-version> "$OZONE_CURRENT_VERSION"` before the commented out
lines.
## Important Notes on Test Scope
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
index 1893053802..07e820477a 100755
--- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh
@@ -35,7 +35,6 @@ RESULT_DIR="$ALL_RESULT_DIR" create_results_dir
# This is the version of Ozone that should use the runner image to run the
# code that was built. Other versions will pull images from docker hub.
-export OZONE_CURRENT_VERSION="${ozone.version}"
run_test ha non-rolling-upgrade 1.4.1 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 1.4.0 "$OZONE_CURRENT_VERSION"
# run_test ha non-rolling-upgrade 1.3.0 "$OZONE_CURRENT_VERSION"
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
index db7a627346..b7604ed04f 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
@@ -19,8 +19,7 @@ COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"
>/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
basename=$(basename ${COMPOSE_DIR})
-# version is used in bucket name, which does not allow uppercase
-current_version="$(echo "${ozone.version}" | sed -e 's/-SNAPSHOT//' | tr
'[:upper:]' '[:lower:]')"
+current_version="${OZONE_CURRENT_VERSION}"
# TODO: debug acceptance test failures for client versions 1.0.0 on secure
clusters
old_versions="1.1.0 1.2.1 1.3.0 1.4.0 1.4.1" # container is needed for each
version in clients.yaml
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
