This is an automated email from the ASF dual-hosted git repository. avijayan pushed a commit to branch HDDS-3698-upgrade in repository https://gitbox.apache.org/repos/asf/hadoop-ozone.git
commit e1cd7af9b55d0d51676cf0e06c10f5c84ec8cb72 Author: Doroszlai, Attila <[email protected]> AuthorDate: Tue Aug 25 13:24:01 2020 +0200 HDDS-4139. Update version number in upgrade tests (#1347) --- hadoop-ozone/dist/src/main/compose/upgrade/README.md | 2 +- hadoop-ozone/dist/src/main/compose/upgrade/test.sh | 2 +- hadoop-ozone/dist/src/main/compose/upgrade/versions/README.md | 2 +- .../main/compose/upgrade/versions/{ozone-0.6.0.sh => ozone-1.0.0.sh} | 0 hadoop-ozone/dist/src/shell/upgrade/{0.6.0.sh => 1.0.0.sh} | 2 +- .../dist/src/shell/upgrade/{0.6.0 => 1.0.0}/01-migrate-scm-db.sh | 0 6 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/README.md b/hadoop-ozone/dist/src/main/compose/upgrade/README.md index 2a832f4..5d844e0 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/README.md +++ b/hadoop-ozone/dist/src/main/compose/upgrade/README.md @@ -26,4 +26,4 @@ current version is run with the `ozone-runner` image using locally built source code. Currently the test script only supports a single version upgrade (eg. -from 0.5.0 to 0.6.0). +from 0.5.0 to 1.0.0). diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh index 0babd17..0c51325 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/test.sh +++ b/hadoop-ozone/dist/src/main/compose/upgrade/test.sh @@ -20,7 +20,7 @@ export COMPOSE_DIR : "${OZONE_REPLICATION_FACTOR:=3}" : "${OZONE_UPGRADE_FROM:="0.5.0"}" -: "${OZONE_UPGRADE_TO:="0.6.0"}" +: "${OZONE_UPGRADE_TO:="1.0.0"}" : "${OZONE_VOLUME:="${COMPOSE_DIR}/data"}" export OZONE_VOLUME diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/versions/README.md b/hadoop-ozone/dist/src/main/compose/upgrade/versions/README.md index c662c2f..24cd113 100644 --- a/hadoop-ozone/dist/src/main/compose/upgrade/versions/README.md +++ b/hadoop-ozone/dist/src/main/compose/upgrade/versions/README.md @@ -12,4 +12,4 @@ limitations under the License. See accompanying LICENSE file. --> -The scripts in this directory define version-specific behavior required for [`testlib.sh`](../../testlib.sh). For example the `ozone admin` command was renamed from `ozone scmcli` in 0.6.0. +The scripts in this directory define version-specific behavior required for [`testlib.sh`](../../testlib.sh). For example the `ozone admin` command was renamed from `ozone scmcli` in 1.0.0. diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.6.0.sh b/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh similarity index 100% rename from hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.6.0.sh rename to hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh diff --git a/hadoop-ozone/dist/src/shell/upgrade/0.6.0.sh b/hadoop-ozone/dist/src/shell/upgrade/1.0.0.sh similarity index 94% rename from hadoop-ozone/dist/src/shell/upgrade/0.6.0.sh rename to hadoop-ozone/dist/src/shell/upgrade/1.0.0.sh index 58c78db..6573978 100755 --- a/hadoop-ozone/dist/src/shell/upgrade/0.6.0.sh +++ b/hadoop-ozone/dist/src/shell/upgrade/1.0.0.sh @@ -20,4 +20,4 @@ SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" : "${SCM_DIR:="${OZONE_VOLUME}/scm"}" : "${OZONE_RUNNER_VERSION:="20200625-1"}" -docker run --rm -v "${SCM_DIR}":/scm -v "${SCRIPT_DIR}/0.6.0":/upgrade -w /scm/metadata apache/ozone-runner:"${OZONE_RUNNER_VERSION}" /upgrade/01-migrate-scm-db.sh +docker run --rm -v "${SCM_DIR}":/scm -v "${SCRIPT_DIR}/1.0.0":/upgrade -w /scm/metadata apache/ozone-runner:"${OZONE_RUNNER_VERSION}" /upgrade/01-migrate-scm-db.sh diff --git a/hadoop-ozone/dist/src/shell/upgrade/0.6.0/01-migrate-scm-db.sh b/hadoop-ozone/dist/src/shell/upgrade/1.0.0/01-migrate-scm-db.sh similarity index 100% rename from hadoop-ozone/dist/src/shell/upgrade/0.6.0/01-migrate-scm-db.sh rename to hadoop-ozone/dist/src/shell/upgrade/1.0.0/01-migrate-scm-db.sh --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
