This is an automated email from the ASF dual-hosted git repository.
myskov 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 f5019b2d2d2 HDDS-12945. Let Robot test check config whether security
is enabled (#8632)
f5019b2d2d2 is described below
commit f5019b2d2d25c195791c799d881cfeef34bcbc93
Author: Anastasia Kostryukova <[email protected]>
AuthorDate: Tue Jul 1 12:14:45 2025 +0300
HDDS-12945. Let Robot test check config whether security is enabled (#8632)
Co-authored-by: Doroszlai, Attila
<[email protected]>
---
hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh | 2 +-
hadoop-ozone/dist/src/main/compose/testlib.sh | 1 -
hadoop-ozone/dist/src/main/smoketest/__init__.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/admincli/cert.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/admincli/container.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/admincli/pipeline.robot | 2 +-
.../dist/src/main/smoketest/admincli/reconfigure.robot | 3 ++-
.../dist/src/main/smoketest/admincli/replicationmanager.robot | 2 +-
.../dist/src/main/smoketest/balancer/testBalancer.robot | 3 ++-
hadoop-ozone/dist/src/main/smoketest/basic/basic.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/basic/links.robot | 1 +
.../dist/src/main/smoketest/basic/ozone-shell-lib.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot | 3 ++-
hadoop-ozone/dist/src/main/smoketest/basic/single_node.robot | 1 +
.../dist/src/main/smoketest/certrotation/cert-rotation.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/commonlib.robot | 11 ++++++++++-
hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot | 1 +
.../dist/src/main/smoketest/debug/ozone-debug-ldb.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/ec/lib.resource | 1 +
hadoop-ozone/dist/src/main/smoketest/ec/rewrite.robot | 2 +-
.../dist/src/main/smoketest/ec/upgrade-ec-check.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/fcq/s3_om_fcq.robot | 1 +
.../dist/src/main/smoketest/freon/generate-chunk.robot | 2 ++
.../dist/src/main/smoketest/freon/validate-chunk.robot | 3 +++
.../dist/src/main/smoketest/grpc/grpc-om-s3-metrics.robot | 2 +-
.../dist/src/main/smoketest/hsync/upgrade-hsync-check.robot | 2 +-
.../dist/src/main/smoketest/httpfs/operations_tests.robot | 4 +++-
.../smoketest/omha/data-creation-before-om-bootstrap.robot | 1 +
.../smoketest/omha/data-validation-after-om-bootstrap.robot | 1 +
.../dist/src/main/smoketest/omha/om-cancel-prepare.robot | 3 ++-
hadoop-ozone/dist/src/main/smoketest/omha/om-fetch-key.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/omha/om-prepare.robot | 3 ++-
hadoop-ozone/dist/src/main/smoketest/omha/om-prepared.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/omha/om-roles.robot | 3 ++-
hadoop-ozone/dist/src/main/smoketest/ozone-lib/freon.robot | 1 -
hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot | 1 +
.../dist/src/main/smoketest/recon/recon-nssummary.robot | 1 +
.../dist/src/main/smoketest/recon/recon-taskstatus.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot | 2 ++
hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/s3/s3_getsecret.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/s3/secretgenerate.robot | 4 ++--
hadoop-ozone/dist/src/main/smoketest/s3/secretrevoke.robot | 4 ++--
.../dist/src/main/smoketest/scmha/scm-decommission.robot | 4 ++--
.../dist/src/main/smoketest/security/ozone-secure-token.robot | 1 +
.../dist/src/main/smoketest/snapshot/snapshot-acls.robot | 3 ++-
.../src/main/smoketest/snapshot/upgrade-snapshot-check.robot | 2 +-
.../dist/src/main/smoketest/upgrade/check-finalization.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/upgrade/finalize.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/upgrade/generate.robot | 2 +-
hadoop-ozone/dist/src/main/smoketest/upgrade/prepare.robot | 1 +
hadoop-ozone/dist/src/main/smoketest/upgrade/validate.robot | 2 +-
53 files changed, 76 insertions(+), 35 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
index c5b8932644f..6c95470c792 100755
--- a/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/hadoop-test.sh
@@ -61,7 +61,7 @@ for HADOOP_TEST_IMAGE in $HADOOP_TEST_IMAGES; do
execute_command_in_container rm hadoop version
if [[ ${SECURITY_ENABLED} == "true" ]]; then
- execute_robot_test rm kinit-hadoop.robot
+ execute_robot_test rm -v SECURITY_ENABLED:"${SECURITY_ENABLED}"
kinit-hadoop.robot
fi
for scheme in o3fs ofs; do
diff --git a/hadoop-ozone/dist/src/main/compose/testlib.sh
b/hadoop-ozone/dist/src/main/compose/testlib.sh
index 0d2e01851c3..eace2ac849d 100755
--- a/hadoop-ozone/dist/src/main/compose/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/testlib.sh
@@ -249,7 +249,6 @@ execute_robot_test(){
-v OM_HA_PARAM:"${OM_HA_PARAM}" \
-v OM_SERVICE_ID:"${OM_SERVICE_ID:-om}" \
-v OZONE_DIR:"${OZONE_DIR}" \
- -v SECURITY_ENABLED:"${SECURITY_ENABLED}" \
-v SCM:"${SCM}" \
${ARGUMENTS[@]} --log NONE --report NONE --output "$OUTPUT_PATH" \
"$SMOKETEST_DIR_INSIDE/$TEST"
diff --git a/hadoop-ozone/dist/src/main/smoketest/__init__.robot
b/hadoop-ozone/dist/src/main/smoketest/__init__.robot
index da3ebf4d259..644c621ea5a 100644
--- a/hadoop-ozone/dist/src/main/smoketest/__init__.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/__init__.robot
@@ -16,4 +16,4 @@
Documentation Smoketest ozone secure cluster
Test Timeout 10 minutes
Resource commonlib.robot
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/cert.robot
b/hadoop-ozone/dist/src/main/smoketest/admincli/cert.robot
index bd5b82b8c4a..8f8777fb9d2 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/cert.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/cert.robot
@@ -17,6 +17,7 @@
Documentation Test ozone admin cert command
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Keywords ***
Setup Test
diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
b/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
index f784f45645e..d419cbf7aec 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/container.robot
@@ -26,7 +26,7 @@ ${SCM} scm
*** Keywords ***
Create test data
- Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit test user
testuser testuser.keytab
+ Kinit test user testuser testuser.keytab
Execute ozone freon ockg -n1 -t1 -p container
Container is closed
diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
b/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
index 50837672d92..b3e14c9bbb6 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/datanode.robot
@@ -17,7 +17,7 @@
Documentation Test ozone admin datanode command
Library BuiltIn
Resource ../commonlib.robot
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
Test Timeout 5 minutes
*** Variables ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/pipeline.robot
b/hadoop-ozone/dist/src/main/smoketest/admincli/pipeline.robot
index 9d18b26876d..90b119dac73 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/pipeline.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/pipeline.robot
@@ -17,7 +17,7 @@
Documentation Test ozone admin pipeline command
Library BuiltIn
Resource ../commonlib.robot
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
Test Timeout 5 minutes
*** Variables ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/admincli/reconfigure.robot
b/hadoop-ozone/dist/src/main/smoketest/admincli/reconfigure.robot
index 0bf2feead60..e975de8768f 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/reconfigure.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/reconfigure.robot
@@ -18,6 +18,7 @@ Documentation Test ozone admin command
Library BuiltIn
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Keywords ***
Setup Test
@@ -35,4 +36,4 @@ Reconfigure SCM
Reconfigure DN
Pass Execution If '${SECURITY_ENABLED}' == 'false' N/A
${output} = Execute ozone admin reconfig
--address=datanode:19864 --service=DATANODE start
- Should Contain ${output} Started reconfiguration task
on node
\ No newline at end of file
+ Should Contain ${output} Started reconfiguration task
on node
diff --git
a/hadoop-ozone/dist/src/main/smoketest/admincli/replicationmanager.robot
b/hadoop-ozone/dist/src/main/smoketest/admincli/replicationmanager.robot
index 9b39cecc9df..6eeb23a944d 100644
--- a/hadoop-ozone/dist/src/main/smoketest/admincli/replicationmanager.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/admincli/replicationmanager.robot
@@ -17,7 +17,7 @@
Documentation Test ozone admin replicationmanager command
Library BuiltIn
Resource ../commonlib.robot
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
Test Timeout 5 minutes
*** Variables ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
b/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
index b1801591365..999aecb2fcf 100644
--- a/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/balancer/testBalancer.robot
@@ -21,10 +21,11 @@ Library Collections
Resource ../commonlib.robot
Resource ../ozone-lib/shell.robot
+Suite Setup Get Security Enabled From Config
+
Test Timeout 20 minutes
*** Variables ***
-${SECURITY_ENABLED} false
${HOST} datanode1
${VOLUME} volume1
${BUCKET} bucket1
diff --git a/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
b/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
index a9d5d17cebb..2ef62ff900a 100644
--- a/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/basic/basic.robot
@@ -19,6 +19,7 @@ Library OperatingSystem
Resource ../commonlib.robot
Resource ../ozone-lib/freon.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Variables ***
${SCM} scm
diff --git a/hadoop-ozone/dist/src/main/smoketest/basic/links.robot
b/hadoop-ozone/dist/src/main/smoketest/basic/links.robot
index 7bcec333423..41da993bae1 100644
--- a/hadoop-ozone/dist/src/main/smoketest/basic/links.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/basic/links.robot
@@ -28,6 +28,7 @@ ${SCM} scm
*** Keywords ***
Create volumes
+ Get Security Enabled From Config
${random} = Generate Random String 5 [NUMBERS]
Set Suite Variable ${source} ${random}-source
Set Suite Variable ${target} ${random}-target
diff --git a/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot
b/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot
index 1c3313f45d1..7affbcba16c 100644
--- a/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell-lib.robot
@@ -18,6 +18,7 @@ Documentation Test ozone shell CLI usage
Library OperatingSystem
Resource ../commonlib.robot
Resource ../ozone-lib/shell.robot
+Suite Setup Get Security Enabled From Config
*** Variables ***
${prefix} generated
diff --git a/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot
b/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot
index 6d1d28f9424..bd61c8a2fd7 100644
--- a/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/basic/ozone-shell.robot
@@ -20,7 +20,8 @@ Resource ../commonlib.robot
Resource ozone-shell-lib.robot
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
Test Timeout 10 minutes
-Suite Setup Generate prefix
+Suite Setup Run Keywords Generate prefix
+... AND Get Security Enabled From Config
*** Test Cases ***
RpcClient with port
diff --git a/hadoop-ozone/dist/src/main/smoketest/basic/single_node.robot
b/hadoop-ozone/dist/src/main/smoketest/basic/single_node.robot
index a55d6b65ddd..3b8050d8bf2 100644
--- a/hadoop-ozone/dist/src/main/smoketest/basic/single_node.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/basic/single_node.robot
@@ -19,6 +19,7 @@ Library OperatingSystem
Resource ../commonlib.robot
Resource ../ozone-lib/freon.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Test Cases ***
diff --git
a/hadoop-ozone/dist/src/main/smoketest/certrotation/cert-rotation.robot
b/hadoop-ozone/dist/src/main/smoketest/certrotation/cert-rotation.robot
index 9d78e0a1588..d3d88f628f1 100644
--- a/hadoop-ozone/dist/src/main/smoketest/certrotation/cert-rotation.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/certrotation/cert-rotation.robot
@@ -25,7 +25,7 @@ ${port} 9859
*** Keywords ***
Setup Test
- Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit test user
testuser testuser.keytab
+ Kinit test user testuser testuser.keytab
Basic key generation and validation
${random} = Generate Random String 10
diff --git a/hadoop-ozone/dist/src/main/smoketest/commonlib.robot
b/hadoop-ozone/dist/src/main/smoketest/commonlib.robot
index 55ed9ddf504..3df0b2ba01b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/commonlib.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/commonlib.robot
@@ -21,7 +21,7 @@ Library BuiltIn
Resource lib/os.robot
*** Variables ***
-${SECURITY_ENABLED} false
+${SECURITY_ENABLED} ${EMPTY}
${OM_HA_PARAM} ${EMPTY}
${OM_SERVICE_ID} om
@@ -31,12 +31,21 @@ Get test user principal
${instance} = Execute hostname | sed
's/scm[0-9].org/scm/;s/scm[0-9]/scm/;s/om[0-9]/om/'
[return] ${user}/${instance}@EXAMPLE.COM
+Get Security Enabled From Config
+ Return From Keyword If '${SECURITY_ENABLED}' != ''
+ ${value} = Execute ozone getconf confKey ozone.security.enabled
+ IF '${value}' != 'true' and '${value}' != 'false'
+ ${value} = Set Variable false
+ END
+ Set Global Variable ${SECURITY_ENABLED} ${value}
+
Kinit HTTP user
Pass Execution If '${SECURITY_ENABLED}' == 'false' Skip in unsecure
cluster
${principal} = Get test user principal HTTP
Wait Until Keyword Succeeds 2min 10sec Execute
kinit -k -t /etc/security/keytabs/HTTP.keytab ${principal}
Kinit test user
+ Get Security Enabled From Config
Pass Execution If '${SECURITY_ENABLED}' == 'false' Skip in unsecure
cluster
[arguments] ${user} ${keytab}
${TEST_USER} = Get test user principal ${user}
diff --git a/hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot
b/hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot
index c0d4ea9f4b3..bd7fe9ff528 100644
--- a/hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/debug/auditparser.robot
@@ -20,6 +20,7 @@ Library BuiltIn
Resource ../commonlib.robot
Resource ../ozone-lib/freon.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Variables ***
${user} hadoop
diff --git a/hadoop-ozone/dist/src/main/smoketest/debug/ozone-debug-ldb.robot
b/hadoop-ozone/dist/src/main/smoketest/debug/ozone-debug-ldb.robot
index d5effac7f0b..57c1512f46c 100644
--- a/hadoop-ozone/dist/src/main/smoketest/debug/ozone-debug-ldb.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/debug/ozone-debug-ldb.robot
@@ -17,6 +17,7 @@
Documentation Test ozone debug ldb CLI
Library OperatingSystem
Resource ../lib/os.robot
+Resource ../commonlib.robot
Test Timeout 5 minute
Suite Setup Write keys
@@ -29,7 +30,6 @@ ${TESTFILE} testfile
*** Keywords ***
Write keys
- Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit test user
testuser testuser.keytab
Execute ozone sh volume create ${VOLUME}
Execute ozone sh bucket create ${VOLUME}/${BUCKET} -l obs
Execute dd if=/dev/urandom of=${TEMP_DIR}/${TESTFILE}1 bs=100
count=10
diff --git a/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
b/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
index f01ec191f55..63b7250e205 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
+++ b/hadoop-ozone/dist/src/main/smoketest/ec/lib.resource
@@ -18,6 +18,7 @@ Documentation Keywords and other resources used by EC
tests
Library OperatingSystem
Resource ../commonlib.robot
Resource ../ozone-lib/shell.robot
+Suite Setup Get Security Enabled From Config
*** Variables ***
${SCM} scm
diff --git a/hadoop-ozone/dist/src/main/smoketest/ec/rewrite.robot
b/hadoop-ozone/dist/src/main/smoketest/ec/rewrite.robot
index 5b5df209ece..163787e1966 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ec/rewrite.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ec/rewrite.robot
@@ -21,7 +21,7 @@ Resource ../lib/os.robot
Resource ../ozone-lib/shell.robot
Resource ../s3/commonawslib.robot
Resource lib.resource
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
*** Variables ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/ec/upgrade-ec-check.robot
b/hadoop-ozone/dist/src/main/smoketest/ec/upgrade-ec-check.robot
index b365960ba57..52bdee35eb9 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ec/upgrade-ec-check.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ec/upgrade-ec-check.robot
@@ -17,7 +17,7 @@
Documentation Test EC during upgrade
Library OperatingSystem
Resource lib.resource
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
*** Test Cases ***
Test EC Prior To Finalization
diff --git a/hadoop-ozone/dist/src/main/smoketest/fcq/s3_om_fcq.robot
b/hadoop-ozone/dist/src/main/smoketest/fcq/s3_om_fcq.robot
index 900fe43f5c0..256a9c3e805 100644
--- a/hadoop-ozone/dist/src/main/smoketest/fcq/s3_om_fcq.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/fcq/s3_om_fcq.robot
@@ -20,6 +20,7 @@ Library String
Library BuiltIn
Resource ../commonlib.robot
Resource ../s3/commonawslib.robot
+Suite Setup Get Security Enabled From Config
*** Variables ***
${OM_JMX_ENDPOINT} http://om:9874/jmx
diff --git a/hadoop-ozone/dist/src/main/smoketest/freon/generate-chunk.robot
b/hadoop-ozone/dist/src/main/smoketest/freon/generate-chunk.robot
index 5742338c399..a7d039a4a6b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/freon/generate-chunk.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/freon/generate-chunk.robot
@@ -16,7 +16,9 @@
*** Settings ***
Documentation Test freon chunk generation commands
Resource ../ozone-lib/freon.robot
+Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Variables ***
${PREFIX} ${EMPTY}
diff --git a/hadoop-ozone/dist/src/main/smoketest/freon/validate-chunk.robot
b/hadoop-ozone/dist/src/main/smoketest/freon/validate-chunk.robot
index 26d3c2aac06..306ea8069b3 100644
--- a/hadoop-ozone/dist/src/main/smoketest/freon/validate-chunk.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/freon/validate-chunk.robot
@@ -16,7 +16,10 @@
*** Settings ***
Documentation Test freon chunk validation commands
Resource ../ozone-lib/freon.robot
+Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
+
*** Variables ***
${PREFIX} ${EMPTY}
diff --git a/hadoop-ozone/dist/src/main/smoketest/grpc/grpc-om-s3-metrics.robot
b/hadoop-ozone/dist/src/main/smoketest/grpc/grpc-om-s3-metrics.robot
index 2b0d4bfeb4b..aca3018356b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/grpc/grpc-om-s3-metrics.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/grpc/grpc-om-s3-metrics.robot
@@ -110,4 +110,4 @@ Check active connections
Wait Until Keyword Succeeds 90sec 10sec
NumOpenClientConnections are higher than zero
ELSE
NumOpenClientConnections are equal to zero
- END
\ No newline at end of file
+ END
diff --git
a/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot
b/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot
index 7e593cf7abb..1723a34e435 100644
--- a/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/hsync/upgrade-hsync-check.robot
@@ -22,7 +22,7 @@ Resource ../commonlib.robot
Resource ../lib/fs.robot
Resource ../debug/ozone-debug.robot
Default Tags pre-finalized-hsync-tests
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
*** Variables ***
${OM_SERVICE_ID} %{OM_SERVICE_ID}
diff --git a/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
b/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
index 1fb34839a57..e617f41decf 100644
--- a/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/httpfs/operations_tests.robot
@@ -22,7 +22,9 @@ Library OperatingSystem
Resource operations.robot
Resource ../lib/os.robot
Resource ../commonlib.robot
-Suite Setup Generate volume
+Suite Setup Run Keywords Generate volume
+... AND Get Security Enabled From Config
+
Test Timeout 2 minutes
*** Variables ***
diff --git
a/hadoop-ozone/dist/src/main/smoketest/omha/data-creation-before-om-bootstrap.robot
b/hadoop-ozone/dist/src/main/smoketest/omha/data-creation-before-om-bootstrap.robot
index 46aaffdebe8..d5df397f462 100644
---
a/hadoop-ozone/dist/src/main/smoketest/omha/data-creation-before-om-bootstrap.robot
+++
b/hadoop-ozone/dist/src/main/smoketest/omha/data-creation-before-om-bootstrap.robot
@@ -17,6 +17,7 @@
Documentation Smoke test for creating data needed for om bootstrap load
test.
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
*** Variables ***
diff --git
a/hadoop-ozone/dist/src/main/smoketest/omha/data-validation-after-om-bootstrap.robot
b/hadoop-ozone/dist/src/main/smoketest/omha/data-validation-after-om-bootstrap.robot
index b3ece0d3587..c150c168b8a 100644
---
a/hadoop-ozone/dist/src/main/smoketest/omha/data-validation-after-om-bootstrap.robot
+++
b/hadoop-ozone/dist/src/main/smoketest/omha/data-validation-after-om-bootstrap.robot
@@ -17,6 +17,7 @@
Documentation Smoke test for validating snapshot data after om bootstrap.
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
*** Variables ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/omha/om-cancel-prepare.robot
b/hadoop-ozone/dist/src/main/smoketest/omha/om-cancel-prepare.robot
index 7a81f8c5f74..92dc1a25a04 100644
--- a/hadoop-ozone/dist/src/main/smoketest/omha/om-cancel-prepare.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/omha/om-cancel-prepare.robot
@@ -20,8 +20,9 @@ Library String
Library BuiltIn
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Run Keywords Generate volume and bucket names
+... AND Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
-Suite Setup Generate volume and bucket names
** Keywords ***
Generate volume and bucket names
diff --git a/hadoop-ozone/dist/src/main/smoketest/omha/om-fetch-key.robot
b/hadoop-ozone/dist/src/main/smoketest/omha/om-fetch-key.robot
index e40e53117af..2632d685264 100644
--- a/hadoop-ozone/dist/src/main/smoketest/omha/om-fetch-key.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/omha/om-fetch-key.robot
@@ -18,7 +18,7 @@ Documentation Smoke test for om fetch-key
Library OperatingSystem
Resource ../commonlib.robot
Test Timeout 5 minute
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
*** Variables ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/omha/om-prepare.robot
b/hadoop-ozone/dist/src/main/smoketest/omha/om-prepare.robot
index 5a2bab95189..b483fd0b925 100644
--- a/hadoop-ozone/dist/src/main/smoketest/omha/om-prepare.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/omha/om-prepare.robot
@@ -21,8 +21,9 @@ Library BuiltIn
Resource ../commonlib.robot
Resource ../ozone-lib/freon.robot
Test Timeout 5 minutes
+Suite Setup Run Keywords Get Security Enabled From Config
+... AND Create Specific OM data for prepare
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
-Suite Setup Create Specific OM data for prepare
*** Keywords ***
Create Specific OM data for prepare
diff --git a/hadoop-ozone/dist/src/main/smoketest/omha/om-prepared.robot
b/hadoop-ozone/dist/src/main/smoketest/omha/om-prepared.robot
index 9a972086513..bf745f67072 100644
--- a/hadoop-ozone/dist/src/main/smoketest/omha/om-prepared.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/omha/om-prepared.robot
@@ -20,6 +20,7 @@ Library String
Library BuiltIn
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
** Test Cases ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/omha/om-roles.robot
b/hadoop-ozone/dist/src/main/smoketest/omha/om-roles.robot
index 3513ec12de1..0412323d30e 100644
--- a/hadoop-ozone/dist/src/main/smoketest/omha/om-roles.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/omha/om-roles.robot
@@ -17,6 +17,7 @@
Documentation Smoke test for listing om roles.
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
*** Keywords ***
@@ -67,4 +68,4 @@ List om roles as TABLE without OM service ID passed
${output_without_id_passed} = Execute ozone
admin om roles --table
Assert Leader Present in TABLE
${output_without_id_passed}
${output_without_id_passed} = Execute And Ignore Error ozone
admin --set=ozone.om.service.ids=omservice,omservice2 om roles --table
- Should Contain
${output_without_id_passed} no Ozone Manager service ID specified
\ No newline at end of file
+ Should Contain
${output_without_id_passed} no Ozone Manager service ID specified
diff --git a/hadoop-ozone/dist/src/main/smoketest/ozone-lib/freon.robot
b/hadoop-ozone/dist/src/main/smoketest/ozone-lib/freon.robot
index b813c9ed411..46d5d3b1668 100644
--- a/hadoop-ozone/dist/src/main/smoketest/ozone-lib/freon.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/ozone-lib/freon.robot
@@ -18,7 +18,6 @@ Resource ../lib/os.robot
*** Variables ***
${OM_HA_PARAM} ${EMPTY}
-${SECURITY_ENABLED} false
*** Keywords ***
Freon DCG
diff --git a/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
b/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
index 883e93bdc5c..bb42b88016a 100644
--- a/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/recon/recon-api.robot
@@ -21,6 +21,7 @@ Library BuiltIn
Resource ../commonlib.robot
Resource ../ozone-lib/freon.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Variables ***
${ENDPOINT_URL} http://recon:9888
diff --git a/hadoop-ozone/dist/src/main/smoketest/recon/recon-nssummary.robot
b/hadoop-ozone/dist/src/main/smoketest/recon/recon-nssummary.robot
index 41dc28ae93f..f5088695791 100644
--- a/hadoop-ozone/dist/src/main/smoketest/recon/recon-nssummary.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/recon/recon-nssummary.robot
@@ -20,6 +20,7 @@ Library String
Library BuiltIn
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Variables ***
${ENDPOINT_URL} http://recon:9888
diff --git a/hadoop-ozone/dist/src/main/smoketest/recon/recon-taskstatus.robot
b/hadoop-ozone/dist/src/main/smoketest/recon/recon-taskstatus.robot
index f04a3ce741e..92d88854b27 100644
--- a/hadoop-ozone/dist/src/main/smoketest/recon/recon-taskstatus.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/recon/recon-taskstatus.robot
@@ -22,6 +22,7 @@ Library Collections
Resource ../ozone-lib/freon.robot
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Variables ***
${BASE_URL} http://recon:9888
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot
b/hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot
index 7b5bee321bb..ee5f5b177ca 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/commonawslib.robot
@@ -75,6 +75,7 @@ Setup v2 headers
Set Environment Variable AWS_SECRET_ACCESS_KEY
ANYKEY
Setup v4 headers
+ Get Security Enabled From Config
Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit test user
testuser testuser.keytab
Run Keyword if '${SECURITY_ENABLED}' == 'true' Setup secure v4
headers
Run Keyword if '${SECURITY_ENABLED}' == 'false' Setup dummy
credentials for S3
@@ -133,6 +134,7 @@ Setup s3 tests
Return From Keyword if ${OZONE_S3_TESTS_SET_UP}
Run Keyword Generate random prefix
Run Keyword Install aws cli
+ Run Keyword Get Security Enabled From Config
Run Keyword if '${OZONE_S3_SET_CREDENTIALS}' == 'true' Setup v4
headers
Run Keyword if '${BUCKET}' == 'generated' Create generated
bucket ${BUCKET_LAYOUT}
Run Keyword if '${BUCKET}' == 'link' Setup links for S3
tests
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
b/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
index e204e177d8d..dca234bf86f 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/objectputget.robot
@@ -302,4 +302,4 @@ Create&Download big file by multipart upload and get file
not existed part numbe
# clean up
Execute AWSS3Cli rm
s3://${BUCKET}/big_file
Execute rm -rf /tmp/big_file
- Execute rm -rf
/tmp/big_file_1
\ No newline at end of file
+ Execute rm -rf
/tmp/big_file_1
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/s3_getsecret.robot
b/hadoop-ozone/dist/src/main/smoketest/s3/s3_getsecret.robot
index aa6b1f28251..60edc0436b1 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/s3_getsecret.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/s3_getsecret.robot
@@ -17,7 +17,7 @@
Documentation Test ozone s3 getsecret command
Resource ../commonlib.robot
Test Timeout 2 minutes
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
*** Keywords ***
Verify output
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/secretgenerate.robot
b/hadoop-ozone/dist/src/main/smoketest/s3/secretgenerate.robot
index db561397e1c..475f140f913 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/secretgenerate.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/secretgenerate.robot
@@ -24,11 +24,11 @@ Test Timeout 5 minutes
Default Tags no-bucket-type
Test Setup Run Keywords Kinit test user testuser
testuser.keytab
... AND Revoke S3 secrets
+Suite Setup Get Security Enabled From Config
Test Teardown Run Keyword Revoke S3 secrets
*** Variables ***
${ENDPOINT_URL} http://s3g:19878
-${SECURITY_ENABLED} true
*** Test Cases ***
@@ -60,4 +60,4 @@ S3 Gateway Reject Secret Generation By Non-admin User
Pass Execution If '${SECURITY_ENABLED}' == 'false' Skipping this
check as security is not enabled
Run Keyword Kinit test user
testuser2 testuser2.keytab
${result} = Execute curl -X PUT
--negotiate -u : -v ${ENDPOINT_URL}/secret/testuser
- Should contain ${result} HTTP/1.1 403
FORBIDDEN ignore_case=True
\ No newline at end of file
+ Should contain ${result} HTTP/1.1 403
FORBIDDEN ignore_case=True
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/secretrevoke.robot
b/hadoop-ozone/dist/src/main/smoketest/s3/secretrevoke.robot
index ed66a27a578..31ee8405b1d 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/secretrevoke.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/s3/secretrevoke.robot
@@ -24,11 +24,11 @@ Test Timeout 5 minutes
Default Tags no-bucket-type
Test Setup Run Keywords Kinit test user testuser
testuser.keytab
... AND Revoke S3 secrets
+Suite Setup Get Security Enabled From Config
Suite Teardown Setup v4 headers
*** Variables ***
${ENDPOINT_URL} http://s3g:19878
-${SECURITY_ENABLED} true
*** Test Cases ***
@@ -54,4 +54,4 @@ S3 Gateway Reject Secret Revoke By Non-admin User
Pass Execution If '${SECURITY_ENABLED}' == 'false' Skipping this
check as security is not enabled
Run Keyword Kinit test user
testuser2 testuser2.keytab
${result} = Execute curl -X DELETE
--negotiate -u : -v ${ENDPOINT_URL}/secret/testuser
- Should contain ${result} HTTP/1.1 403
FORBIDDEN ignore_case=True
\ No newline at end of file
+ Should contain ${result} HTTP/1.1 403
FORBIDDEN ignore_case=True
diff --git a/hadoop-ozone/dist/src/main/smoketest/scmha/scm-decommission.robot
b/hadoop-ozone/dist/src/main/smoketest/scmha/scm-decommission.robot
index 8bd8fc87b67..81bd0502115 100644
--- a/hadoop-ozone/dist/src/main/smoketest/scmha/scm-decommission.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/scmha/scm-decommission.robot
@@ -19,7 +19,7 @@ Library OperatingSystem
Library BuiltIn
Resource ../commonlib.robot
Test Timeout 5 minutes
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
*** Variables ***
${VOLUME} decom-volume
@@ -86,4 +86,4 @@ Decommission SCM Primordial Node
Should be Equal ${node_count_expect}
${node_count_post}
Execute ozone sh key get /${VOLUME}/${BUCKET}/${TESTFILE}
/tmp/getdecomfile
${md5sum_new} = Execute md5sum /tmp/getdecomfile |
awk '{print $1}'
- Should be Equal ${md5sum}
${md5sum_new}
\ No newline at end of file
+ Should be Equal ${md5sum}
${md5sum_new}
diff --git
a/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-token.robot
b/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-token.robot
index 4d803873b8b..a3fd5150bca 100644
--- a/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-token.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/security/ozone-secure-token.robot
@@ -20,6 +20,7 @@ Library String
Library BuiltIn
Resource ../commonlib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
*** Variables ***
${TOKEN_FILE} ${TEMP_DIR}/ozone.token
diff --git a/hadoop-ozone/dist/src/main/smoketest/snapshot/snapshot-acls.robot
b/hadoop-ozone/dist/src/main/smoketest/snapshot/snapshot-acls.robot
index d95f8e3305b..daebc86d1dc 100644
--- a/hadoop-ozone/dist/src/main/smoketest/snapshot/snapshot-acls.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/snapshot/snapshot-acls.robot
@@ -18,7 +18,8 @@ Documentation Test for reading snapshots with ACLs as
different users
Library OperatingSystem
Resource snapshot-setup.robot
Test Timeout 5 minutes
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'false'
BuiltIn.Skip
+Suite Setup Run Keywords Get Security Enabled From Config
+... AND Run Keyword if '${SECURITY_ENABLED}' == 'false'
BuiltIn.Skip
*** Variables ***
${USER1} = testuser
diff --git
a/hadoop-ozone/dist/src/main/smoketest/snapshot/upgrade-snapshot-check.robot
b/hadoop-ozone/dist/src/main/smoketest/snapshot/upgrade-snapshot-check.robot
index 6003e6dbb33..18c3fba77fa 100644
--- a/hadoop-ozone/dist/src/main/smoketest/snapshot/upgrade-snapshot-check.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/snapshot/upgrade-snapshot-check.robot
@@ -19,7 +19,7 @@ Library OperatingSystem
Library BuiltIn
Resource ../commonlib.robot
Default Tags pre-finalized-snapshot-tests
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
Test Timeout 5 minutes
*** Variables ***
diff --git
a/hadoop-ozone/dist/src/main/smoketest/upgrade/check-finalization.robot
b/hadoop-ozone/dist/src/main/smoketest/upgrade/check-finalization.robot
index e80e555798a..717a2998f79 100644
--- a/hadoop-ozone/dist/src/main/smoketest/upgrade/check-finalization.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/upgrade/check-finalization.robot
@@ -18,6 +18,7 @@ Documentation Finalize Upgrade of the Ozone cluster
Resource ../commonlib.robot
Resource lib.robot
Test Timeout 10 minutes
+Suite Setup Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
*** Test Cases ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/upgrade/finalize.robot
b/hadoop-ozone/dist/src/main/smoketest/upgrade/finalize.robot
index 4cb9caaf494..0fcf52c601b 100644
--- a/hadoop-ozone/dist/src/main/smoketest/upgrade/finalize.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/upgrade/finalize.robot
@@ -18,6 +18,7 @@ Documentation Finalize Upgrade of the Ozone cluster
Resource ../commonlib.robot
Resource lib.robot
Test Timeout 10 minutes
+Suite Setup Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
*** Test Cases ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/upgrade/generate.robot
b/hadoop-ozone/dist/src/main/smoketest/upgrade/generate.robot
index 3730e265868..f570443f973 100644
--- a/hadoop-ozone/dist/src/main/smoketest/upgrade/generate.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/upgrade/generate.robot
@@ -19,7 +19,7 @@ Library OperatingSystem
Library BuiltIn
Resource ../commonlib.robot
Resource ../s3/commonawslib.robot
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
Test Timeout 5 minutes
*** Variables ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/upgrade/prepare.robot
b/hadoop-ozone/dist/src/main/smoketest/upgrade/prepare.robot
index cca3ca25835..021515ebd06 100644
--- a/hadoop-ozone/dist/src/main/smoketest/upgrade/prepare.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/upgrade/prepare.robot
@@ -18,6 +18,7 @@ Documentation Prepares OMs
Resource ../commonlib.robot
Resource lib.robot
Test Timeout 5 minutes
+Suite Setup Get Security Enabled From Config
Test Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
*** Test Cases ***
diff --git a/hadoop-ozone/dist/src/main/smoketest/upgrade/validate.robot
b/hadoop-ozone/dist/src/main/smoketest/upgrade/validate.robot
index 0205ba40e69..b4ec1509e49 100644
--- a/hadoop-ozone/dist/src/main/smoketest/upgrade/validate.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/upgrade/validate.robot
@@ -19,7 +19,7 @@ Library OperatingSystem
Library BuiltIn
Resource ../commonlib.robot
Resource ../s3/commonawslib.robot
-Suite Setup Run Keyword if '${SECURITY_ENABLED}' == 'true' Kinit
test user testuser testuser.keytab
+Suite Setup Kinit test user testuser testuser.keytab
Test Timeout 5 minutes
*** Variables ***
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
