Skip to content

HDDS-8219. Run HA secure tests from s3g container #4444

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.

Sign up for GitHub

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

Merged
adoroszlai merged 7 commits into from
Mar 25, 2023
Merged

HDDS-8219. Run HA secure tests from s3g container #4444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
abd7e61
HDDS-7975. Acceptance tests need rebalancing
adoroszlai Mar 20, 2023
a36a25b
HDDS-8219. Run HA secure tests from s3g container
adoroszlai Mar 20, 2023
b9871f1
Distribute FS and S3 tests
adoroszlai Mar 20, 2023
1f22831
tweak
adoroszlai Mar 20, 2023
f42ecdd
Merge branch 'HDDS-7975' into HDDS-8219
adoroszlai Mar 21, 2023
91f1b57
Merge remote-tracking branch 'origin/master' into HDDS-8219
adoroszlai Mar 22, 2023
810f4d6
Merge remote-tracking branch 'origin/master' into HDDS-8219
adoroszlai Mar 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ start_docker_env

execute_command_in_container kms hadoop key create ${OZONE_BUCKET_KEY_NAME}

execute_robot_test ${SCM} kinit.robot
execute_robot_test s3g kinit.robot

execute_robot_test ${SCM} freon
execute_robot_test s3g freon

execute_robot_test ${SCM} -v SCHEME:o3fs -v BUCKET_TYPE:link -N ozonefs-o3fs-link ozonefs/ozonefs.robot
execute_robot_test s3g -v SCHEME:o3fs -v BUCKET_TYPE:link -N ozonefs-o3fs-link ozonefs/ozonefs.robot

execute_robot_test ${SCM} basic/links.robot
execute_robot_test s3g basic/links.robot

exclude=""
for bucket in encrypted link; do
Expand All @@ -48,15 +48,16 @@ for bucket in encrypted link; do
exclude="--exclude no-bucket-type"
done

execute_robot_test ${SCM} admincli
execute_robot_test s3g admincli

execute_robot_test ${SCM} omha/om-leader-transfer.robot
execute_robot_test ${SCM} scmha/scm-leader-transfer.robot
execute_robot_test s3g omha/om-leader-transfer.robot
execute_robot_test s3g scmha/scm-leader-transfer.robot

execute_robot_test ${SCM} httpfs
execute_robot_test s3g httpfs

export SCM=scm2.org
execute_robot_test ${SCM} admincli
execute_robot_test s3g admincli

stop_docker_env

generate_report
11 changes: 6 additions & 5 deletions hadoop-ozone/dist/src/main/smoketest/basic/links.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ Setup ACL tests
Execute ozone sh bucket link ${source}/readable-bucket ${target}/readable-link
Execute ozone sh bucket link ${source}/readable-bucket ${target}/unreadable-link
Execute ozone sh bucket link ${source}/unreadable-bucket ${target}/link-to-unreadable-bucket
Execute ozone sh volume addacl --acl user:testuser2/[email protected]:r ${target}
Execute ozone sh volume addacl --acl user:testuser2/[email protected]:rl ${source}
Execute ozone sh bucket addacl --acl user:testuser2/[email protected]:rl ${source}/readable-bucket
Execute ozone sh bucket addacl --acl user:testuser2/[email protected]:r ${target}/readable-link
Execute ozone sh bucket addacl --acl user:testuser2/[email protected]:r ${target}/link-to-unreadable-bucket
${principal} = Get test user principal testuser2
Execute ozone sh volume addacl --acl user:${principal}:r ${target}
Execute ozone sh volume addacl --acl user:${principal}:rl ${source}
Execute ozone sh bucket addacl --acl user:${principal}:rl ${source}/readable-bucket
Execute ozone sh bucket addacl --acl user:${principal}:r ${target}/readable-link
Execute ozone sh bucket addacl --acl user:${principal}:r ${target}/link-to-unreadable-bucket

Can follow link with read access
Execute kdestroy
Expand Down
15 changes: 10 additions & 5 deletions hadoop-ozone/dist/src/main/smoketest/commonlib.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,20 @@ ${OM_HA_PARAM} ${EMPTY}
${OM_SERVICE_ID} om

*** Keywords ***
Get test user principal
[arguments] ${user}
${instance} = Execute hostname | sed 's/scm[0-9].org/scm/'
[return] ${user}/${instance}@EXAMPLE.COM

Kinit HTTP user
${hostname} = Execute hostname | sed 's/scm[0-9].org/scm/'
Wait Until Keyword Succeeds 2min 10sec Execute kinit -k HTTP/${hostname}@EXAMPLE.COM -t /etc/security/keytabs/HTTP.keytab
${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
[arguments] ${user} ${keytab}
${instance} = Execute hostname | sed 's/scm[0-9].org/scm/'
Set Suite Variable ${TEST_USER} ${user}/${instance}@EXAMPLE.COM
Wait Until Keyword Succeeds 2min 10sec Execute kinit -k ${user}/${instance}@EXAMPLE.COM -t /etc/security/keytabs/${keytab}
${TEST_USER} = Get test user principal ${user}
Set Suite Variable ${TEST_USER}
Wait Until Keyword Succeeds 2min 10sec Execute kinit -k -t /etc/security/keytabs/${keytab} ${TEST_USER}

Access should be denied
[arguments] ${command}
Expand Down