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 0355845b0e HDDS-9508. Rebalance acceptance tests (#5467)
0355845b0e is described below
commit 0355845b0eecee69b46b7bd39b6c16beba627347
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Wed Oct 25 11:43:50 2023 +0200
HDDS-9508. Rebalance acceptance tests (#5467)
---
.../{test-s3g-virtual-host.sh => test-leadership.sh} | 16 ++++++++++++----
.../main/compose/ozonesecure-ha/test-s3g-virtual-host.sh | 2 +-
.../main/compose/ozonesecure-ha/test-scm-decommission.sh | 2 +-
.../dist/src/main/compose/ozonesecure-ha/test.sh | 15 ---------------
.../dist/src/main/compose/ozonesecure/test-vault.sh | 2 +-
5 files changed, 15 insertions(+), 22 deletions(-)
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-leadership.sh
old mode 100755
new mode 100644
similarity index 78%
copy from
hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
copy to hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-leadership.sh
index 2bc3125801..605d8ebcfb
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-s3g-virtual-host.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-leadership.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:HA-secure
+#suite:leadership
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
@@ -23,12 +23,20 @@ export COMPOSE_DIR
export SECURITY_ENABLED=true
export OM_SERVICE_ID="omservice"
export SCM=scm1.org
-export COMPOSE_FILE=docker-compose.yaml:s3g-virtual-host.yaml
# shellcheck source=/dev/null
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 kinit.robot
+
+execute_robot_test s3g admincli
+
+execute_robot_test s3g omha/om-fetch-key.robot
+
+execute_robot_test s3g omha/om-roles.robot
+
+execute_robot_test s3g omha/om-leader-transfer.robot
+
+execute_robot_test s3g scmha/scm-leader-transfer.robot
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 2bc3125801..0d05f19014 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
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:HA-secure
+#suite:misc
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
diff --git
a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
index e22842cb7b..bf1bcd3f81 100644
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test-scm-decommission.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:HA-secure
+#suite:leadership
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
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 ba6fb63fd3..50b9ad6cfc 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure-ha/test.sh
@@ -49,18 +49,3 @@ for bucket in encrypted link; do
## Exclude virtual-host.robot
exclude="--exclude virtual-host --exclude no-bucket-type"
done
-
-execute_robot_test s3g admincli
-
-execute_robot_test s3g omha/om-fetch-key.robot
-
-execute_robot_test s3g omha/om-roles.robot
-
-execute_robot_test s3g omha/om-leader-transfer.robot
-
-execute_robot_test s3g scmha/scm-leader-transfer.robot
-
-execute_robot_test s3g httpfs
-
-export SCM=scm2.org
-execute_robot_test s3g admincli
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 f2bc0948fe..f3e8bb8e65 100755
--- a/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozonesecure/test-vault.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:secure
+#suite:misc
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
