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 dee55f817d HDDS-8790. Split EC acceptance tests (#4855)
dee55f817d is described below
commit dee55f817dc5072aa0c38ec5e343aaf3855b70d6
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Thu Jun 8 18:26:40 2023 +0200
HDDS-8790. Split EC acceptance tests (#4855)
---
.github/workflows/ci.yml | 1 +
.../src/main/compose/ozone/{test.sh => test-ec.sh} | 43 +++-------------------
hadoop-ozone/dist/src/main/compose/ozone/test.sh | 16 +-------
3 files changed, 7 insertions(+), 53 deletions(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d63064e898..ff4d386aec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -254,6 +254,7 @@ jobs:
- secure
- unsecure
- compat
+ - EC
- HA-secure
- HA-unsecure
- MR
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
b/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
old mode 100755
new mode 100644
similarity index 55%
copy from hadoop-ozone/dist/src/main/compose/ozone/test.sh
copy to hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
index 2958f90b56..70693ceeab
--- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test-ec.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:unsecure
+#suite:EC
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
@@ -28,48 +28,15 @@ source "$COMPOSE_DIR/../testlib.sh"
start_docker_env 5
-execute_robot_test scm lib
-execute_robot_test scm ozone-lib
-
-execute_robot_test om auditparser
-
-execute_robot_test scm basic
-
-execute_robot_test scm gdpr
-
-execute_robot_test scm security/ozone-secure-token.robot
-
-exclude=""
-for bucket in erasure; 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="--exclude no-bucket-type"
-done
-
-execute_robot_test scm recon
-
-execute_robot_test scm om-ratis
-
-execute_robot_test scm freon
-
-execute_robot_test scm cli
-execute_robot_test scm admincli
-
-execute_robot_test scm -v USERNAME:httpfs httpfs
-execute_debug_tests
-
-execute_robot_test scm -v SCHEME:o3fs -v BUCKET_TYPE:bucket -N
ozonefs-o3fs-bucket ozonefs/ozonefs.robot
+execute_robot_test scm -v BUCKET:erasure s3
prefix=${RANDOM}
execute_robot_test scm -v PREFIX:${prefix} ec/basic.robot
docker-compose up -d --no-recreate --scale datanode=4
-execute_robot_test scm -v PREFIX:${prefix} ec/read.robot
+execute_robot_test scm -v PREFIX:${prefix} -N read-4-datanodes ec/read.robot
docker-compose up -d --no-recreate --scale datanode=3
-execute_robot_test scm -v PREFIX:${prefix} ec/read.robot
-
-execute_robot_test s3g grpc/grpc-om-s3-metrics.robot
-
-execute_robot_test scm --exclude pre-finalized-snapshot-tests snapshot
+execute_robot_test scm -v PREFIX:${prefix} -N read-3-datanodes ec/read.robot
+docker-compose up -d --no-recreate --scale datanode=5
stop_docker_env
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
index 2958f90b56..02cf5e6bff 100755
--- a/hadoop-ozone/dist/src/main/compose/ozone/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
@@ -26,7 +26,7 @@ export OZONE_REPLICATION_FACTOR=3
# shellcheck source=/dev/null
source "$COMPOSE_DIR/../testlib.sh"
-start_docker_env 5
+start_docker_env
execute_robot_test scm lib
execute_robot_test scm ozone-lib
@@ -39,13 +39,6 @@ execute_robot_test scm gdpr
execute_robot_test scm security/ozone-secure-token.robot
-exclude=""
-for bucket in erasure; 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="--exclude no-bucket-type"
-done
-
execute_robot_test scm recon
execute_robot_test scm om-ratis
@@ -60,13 +53,6 @@ execute_debug_tests
execute_robot_test scm -v SCHEME:o3fs -v BUCKET_TYPE:bucket -N
ozonefs-o3fs-bucket ozonefs/ozonefs.robot
-prefix=${RANDOM}
-execute_robot_test scm -v PREFIX:${prefix} ec/basic.robot
-docker-compose up -d --no-recreate --scale datanode=4
-execute_robot_test scm -v PREFIX:${prefix} ec/read.robot
-docker-compose up -d --no-recreate --scale datanode=3
-execute_robot_test scm -v PREFIX:${prefix} ec/read.robot
-
execute_robot_test s3g grpc/grpc-om-s3-metrics.robot
execute_robot_test scm --exclude pre-finalized-snapshot-tests snapshot
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
