This is an automated email from the ASF dual-hosted git repository.
adoroszlai 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 9d2fafd2779 HDDS-15347. Move virtual-host test out of smoketest/s3
(#10334)
9d2fafd2779 is described below
commit 9d2fafd27797caae5b48b34437a462c67c3ed3c1
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Sat May 30 14:43:53 2026 +0200
HDDS-15347. Move virtual-host test out of smoketest/s3 (#10334)
---
hadoop-ozone/dist/src/main/compose/common/ec-test.sh | 3 +--
hadoop-ozone/dist/src/main/compose/ozone-ha/test-haproxy-s3g.sh | 6 ++----
hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh | 5 ++---
.../dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh | 6 ++----
.../dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh | 2 +-
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh | 6 ++----
hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh | 3 +--
hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh | 6 ++----
.../dist/src/main/smoketest/{s3 => }/awss3virtualhost.robot | 5 ++---
9 files changed, 15 insertions(+), 27 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/common/ec-test.sh
b/hadoop-ozone/dist/src/main/compose/common/ec-test.sh
index 556590a14a2..6363e9cde5b 100755
--- a/hadoop-ozone/dist/src/main/compose/common/ec-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/ec-test.sh
@@ -17,8 +17,7 @@
start_docker_env 5
-## Exclude virtual-host tests. This is tested separately as it requires
additional config.
-execute_robot_test scm -v BUCKET:erasure --exclude virtual-host s3
+execute_robot_test scm -v BUCKET:erasure s3
execute_robot_test scm ec/rewrite.robot
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-haproxy-s3g.sh
b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-haproxy-s3g.sh
index af67a7099dd..83c1c364a23 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test-haproxy-s3g.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test-haproxy-s3g.sh
@@ -30,11 +30,9 @@ source "$COMPOSE_DIR/../testlib.sh"
start_docker_env
-## Exclude virtual-host tests. This is tested separately as it requires
additional config.
-exclude="--exclude virtual-host"
+exclude=""
for bucket in generated; do
execute_robot_test ${SCM} -v BUCKET:${bucket} -N s3-${bucket} ${exclude} s3
# some tests are independent of the bucket type, only need to be run once
- ## Exclude awss3virtualhost.robot
- exclude="--exclude virtual-host --exclude no-bucket-type"
+ exclude="--exclude no-bucket-type"
done
diff --git a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
index 6c09e7b7615..c27f14e579a 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone-ha/test.sh
@@ -37,13 +37,12 @@ execute_robot_test ${SCM} basic/links.robot
execute_robot_test ${SCM} -v SCHEME:ofs -v BUCKET_TYPE:link -N
ozonefs-ofs-link ozonefs/ozonefs.robot
-## Exclude virtual-host tests. This is tested separately as it requires
additional config.
-exclude="--exclude virtual-host"
+exclude=""
for bucket in generated; do
for layout in OBJECT_STORE LEGACY FILE_SYSTEM_OPTIMIZED; do
execute_robot_test ${SCM} -v BUCKET:${bucket} -v BUCKET_LAYOUT:${layout}
-N s3-${layout}-${bucket} ${exclude} s3
# some tests are independent of the bucket type, only need to be run once
- exclude="--exclude virtual-host --exclude no-bucket-type"
+ exclude="--exclude no-bucket-type"
done
done
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
index a2b11418a88..722aab772e2 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-haproxy-s3g.sh
@@ -35,11 +35,9 @@ start_docker_env
execute_command_in_container kms hadoop key create ${OZONE_BUCKET_KEY_NAME}
-## Exclude virtual-host tests. This is tested separately as it requires
additional config.
-exclude="--exclude virtual-host"
+exclude=""
for bucket in encrypted; do
execute_robot_test recon -v BUCKET:${bucket} -N s3-${bucket} ${exclude} s3
# some tests are independent of the bucket type, only need to be run once
- ## Exclude virtual-host.robot
- exclude="--exclude virtual-host --exclude no-bucket-type"
+ exclude="--exclude no-bucket-type"
done
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
index 93f6ea1363a..97ea1a18114 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
@@ -33,4 +33,4 @@ source "$COMPOSE_DIR/../testlib.sh"
start_docker_env
## Run virtual host test cases
-execute_robot_test s3g -N s3-virtual-host s3/awss3virtualhost.robot
+execute_robot_test s3g -N s3-virtual-host awss3virtualhost.robot
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
index 6d0b4442ffa..250c66860f8 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
@@ -46,13 +46,11 @@ execute_robot_test s3g -v SCHEME:o3fs -v BUCKET_TYPE:link
-N ozonefs-o3fs-link o
execute_robot_test s3g basic/links.robot
-## Exclude virtual-host tests. This is tested separately as it requires
additional config.
-exclude="--exclude virtual-host"
+exclude=""
for bucket in link; do
execute_robot_test s3g -v BUCKET:${bucket} -N s3-${bucket} ${exclude} s3
# some tests are independent of the bucket type, only need to be run once
- ## Exclude virtual-host.robot
- exclude="--exclude virtual-host --exclude no-bucket-type"
+ exclude="--exclude no-bucket-type"
done
# Run Fault Injection tests at the end
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
index 0d1fa16a927..1c6cc374053 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
@@ -30,5 +30,4 @@ export COMPOSE_FILE=docker-compose.yaml:vault.yaml
start_docker_env
-## Exclude virtual-host tests. This is tested separately as it requires
additional config.
-execute_robot_test scm --exclude virtual-host s3
+execute_robot_test scm s3
diff --git a/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
index 637268b59e5..26983aebea6 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test.sh
@@ -43,13 +43,11 @@ execute_robot_test scm repair/bucket-encryption.robot
execute_robot_test scm -v SCHEME:ofs -v BUCKET_TYPE:bucket -N
ozonefs-ofs-bucket ozonefs/ozonefs.robot
-## Exclude virtual-host tests. This is tested separately as it requires
additional config.
-exclude="--exclude virtual-host"
+exclude=""
for bucket in encrypted; do
execute_robot_test s3g -v BUCKET:${bucket} -N s3-${bucket} ${exclude} s3
# some tests are independent of the bucket type, only need to be run once
- ## Exclude virtual-host.robot
- exclude="--exclude virtual-host --exclude no-bucket-type"
+ exclude="--exclude no-bucket-type"
done
#expects 4 pipelines, should be run before
diff --git a/hadoop-ozone/dist/src/main/smoketest/s3/awss3virtualhost.robot
b/hadoop-ozone/dist/src/main/smoketest/awss3virtualhost.robot
similarity index 96%
rename from hadoop-ozone/dist/src/main/smoketest/s3/awss3virtualhost.robot
rename to hadoop-ozone/dist/src/main/smoketest/awss3virtualhost.robot
index 8f77e2c3e87..40c02415348 100644
--- a/hadoop-ozone/dist/src/main/smoketest/s3/awss3virtualhost.robot
+++ b/hadoop-ozone/dist/src/main/smoketest/awss3virtualhost.robot
@@ -17,11 +17,10 @@
Documentation S3 gateway test with aws cli using virtual host style
address
Library OperatingSystem
Library String
-Resource ../commonlib.robot
-Resource ./commonawslib.robot
+Resource commonlib.robot
+Resource s3/commonawslib.robot
Test Timeout 5 minutes
Suite Setup Setup s3 tests
-Default Tags virtual-host
*** Variables ***
${ENDPOINT_URL} http://s3g.internal:9878
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
