Fix upgrade acceptance test.

apache · Aug 25, 2020 · 58c79ea · 58c79ea
1 parent ac127fa
commit 58c79ea
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -72,7 +72,7 @@ wait_for_safemode_exit(){
   while [[ $SECONDS -lt 180 ]]; do
 
      #This line checks the safemode status in scm
-     local command="ozone ${OZONE_ADMIN_COMMAND} safemode status --verbose"
+     local command="${OZONE_SAFEMODE_STATUS_COMMAND}"
      if [[ "${SECURITY_ENABLED}" == 'true' ]]; then
          status=$(docker-compose exec -T scm bash -c "kinit -k HTTP/scm@EXAMPLE.COM -t /etc/security/keytabs/HTTP.keytab && $command" || true)
      else

diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh b/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-0.5.0.sh
@@ -16,3 +16,4 @@
 # limitations under the License.
 
 export OZONE_ADMIN_COMMAND=scmcli
+export OZONE_SAFEMODE_STATUS_COMMAND='ozone scmcli safemode status'
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh b/hadoop-ozone/dist/src/main/compose/upgrade/versions/ozone-1.0.0.sh
@@ -16,3 +16,4 @@
 # limitations under the License.
 
 export OZONE_ADMIN_COMMAND=admin
+export OZONE_SAFEMODE_STATUS_COMMAND='ozone admin safemode status --verbose'