HDDS-5018. [FSO] Add robot tests for new Filesystem layout (#2071)

apache · Apr 7, 2021 · bf340bc · bf340bc
1 parent 055771e
commit bf340bc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 6 deletions.
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml b/hadoop-ozone/dist/src/main/compose/ozone/docker-compose.yaml
@@ -25,6 +25,11 @@ x-common-config:
   env_file:
     - docker-config
 
+x-layout_version:
+  &layout_version
+  OZONE-SITE.XML_ozone.om.layout.version: ${OZONE_OM_LAYOUT_VERSION:-V0}
+  OZONE-SITE.XML_ozone.om.enable.filesystem.paths: ${OZONE_OM_ENABLE_FILESYSTEM_PATHS:-false}
+
 x-replication:
   &replication
   OZONE-SITE.XML_ozone.replication: ${OZONE_REPLICATION_FACTOR:-1}
@@ -37,6 +42,7 @@ services:
       - 9882
     environment:
       <<: *replication
+      <<: *layout_version
       OZONE_OPTS:
     command: ["ozone","datanode"]
   om:
@@ -45,6 +51,7 @@ services:
       ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
       OZONE_OPTS:
       <<: *replication
+      <<: *layout_version
     ports:
       - 9874:9874
       - 9862:9862
@@ -59,12 +66,14 @@ services:
       OZONE-SITE.XML_hdds.scm.safemode.min.datanode: ${OZONE_SAFEMODE_MIN_DATANODES:-1}
       OZONE_OPTS:
       <<: *replication
+      <<: *layout_version
     command: ["ozone","scm"]
   s3g:
     <<: *common-config
     environment:
       OZONE_OPTS:
       <<: *replication
+      <<: *layout_version
     ports:
       - 9878:9878
     command: ["ozone","s3g"]
@@ -75,4 +84,5 @@ services:
     environment:
       OZONE_OPTS:
       <<: *replication
+      <<: *layout_version
     command: ["ozone","recon"]
diff --git a/hadoop-ozone/dist/src/main/compose/ozone/test.sh b/hadoop-ozone/dist/src/main/compose/ozone/test.sh
@@ -35,12 +35,6 @@ execute_robot_test scm basic
 
 execute_robot_test scm gdpr
 
-for scheme in ofs o3fs; do
-  for bucket in link bucket; do
-    execute_robot_test scm -v SCHEME:${scheme} -v BUCKET_TYPE:${bucket} -N ozonefs-${scheme}-${bucket} ozonefs/ozonefs.robot
-  done
-done
-
 execute_robot_test scm security/ozone-secure-token.robot
 
 for bucket in link generated; do
@@ -57,4 +51,23 @@ execute_robot_test scm cli
 
 stop_docker_env
 
+# running FS tests with different config requires restart of the cluster
+export OZONE_KEEP_RESULTS=true
+export OZONE_OM_LAYOUT_VERSION OZONE_OM_ENABLE_FILESYSTEM_PATHS
+for OZONE_OM_LAYOUT_VERSION in V0 V1; do
+  if [[ $OZONE_OM_LAYOUT_VERSION == "V1" ]]; then
+    OZONE_OM_ENABLE_FILESYSTEM_PATHS=true
+  else
+    OZONE_OM_ENABLE_FILESYSTEM_PATHS=false
+  fi
+
+  start_docker_env
+  for scheme in ofs o3fs; do
+    for bucket in link bucket; do
+      execute_robot_test scm -v SCHEME:${scheme} -v BUCKET_TYPE:${bucket} -N ozonefs-${OZONE_OM_LAYOUT_VERSION}-${scheme}-${bucket} ozonefs/ozonefs.robot
+    done
+  done
+  stop_docker_env
+done
+
 generate_report