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 1f29e05ea1 HDDS-11934. Split compat suite to old/new (#7578)
1f29e05ea1 is described below
commit 1f29e05ea1f5633435b0a02e747ccf7ff2afcd1b
Author: Doroszlai, Attila <[email protected]>
AuthorDate: Tue Dec 17 20:30:08 2024 +0100
HDDS-11934. Split compat suite to old/new (#7578)
---
.../dist/src/main/compose/compatibility/test.sh | 2 +-
.../src/main/compose/xcompat/{test.sh => lib.sh} | 11 -----------
.../{compatibility/test.sh => xcompat/test-new.sh} | 18 +++++-------------
.../{compatibility/test.sh => xcompat/test-old.sh} | 21 ++++++++-------------
4 files changed, 14 insertions(+), 38 deletions(-)
diff --git a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
b/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
index ee83c8ac33..5b9d757ee2 100755
--- a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:compat
+#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/xcompat/test.sh
b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
similarity index 88%
rename from hadoop-ozone/dist/src/main/compose/xcompat/test.sh
rename to hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
index e452463a06..db7a627346 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
@@ -15,8 +15,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:compat
-
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
basename=$(basename ${COMPOSE_DIR})
@@ -114,12 +112,3 @@ test_cross_compatibility() {
}
create_results_dir
-
-# current cluster with various clients
-COMPOSE_FILE=new-cluster.yaml:clients.yaml cluster_version=${current_version}
test_cross_compatibility ${old_versions} ${current_version}
-
-# old cluster with clients: same version and current version
-for cluster_version in ${old_versions}; do
- export OZONE_VERSION=${cluster_version}
- COMPOSE_FILE=old-cluster.yaml:clients.yaml test_cross_compatibility
${cluster_version} ${current_version}
-done
diff --git a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
b/hadoop-ozone/dist/src/main/compose/xcompat/test-new.sh
similarity index 66%
copy from hadoop-ozone/dist/src/main/compose/compatibility/test.sh
copy to hadoop-ozone/dist/src/main/compose/xcompat/test-new.sh
index ee83c8ac33..3acea6b793 100755
--- a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/test-new.sh
@@ -15,21 +15,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:compat
+#suite:compat-new
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
-export SECURITY_ENABLED=false
-export OZONE_REPLICATION_FACTOR=1
+# shellcheck source=hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
+source "${COMPOSE_DIR}/lib.sh"
-# shellcheck source=/dev/null
-source "$COMPOSE_DIR/../testlib.sh"
-
-start_docker_env ${OZONE_REPLICATION_FACTOR}
-
-execute_robot_test datanode compatibility/dn.robot
-execute_robot_test om compatibility/om.robot
-execute_robot_test recon compatibility/recon.robot
-execute_robot_test scm compatibility/scm.robot
-execute_robot_test datanode compatibility/dn-one-rocksdb.robot
+# current cluster with various clients
+COMPOSE_FILE=new-cluster.yaml:clients.yaml cluster_version=${current_version}
test_cross_compatibility ${old_versions} ${current_version}
diff --git a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
b/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
similarity index 66%
copy from hadoop-ozone/dist/src/main/compose/compatibility/test.sh
copy to hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
index ee83c8ac33..d54b555262 100755
--- a/hadoop-ozone/dist/src/main/compose/compatibility/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/test-old.sh
@@ -15,21 +15,16 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-#suite:compat
+#suite:compat-old
COMPOSE_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
export COMPOSE_DIR
-export SECURITY_ENABLED=false
-export OZONE_REPLICATION_FACTOR=1
+# shellcheck source=hadoop-ozone/dist/src/main/compose/xcompat/lib.sh
+source "${COMPOSE_DIR}/lib.sh"
-# shellcheck source=/dev/null
-source "$COMPOSE_DIR/../testlib.sh"
-
-start_docker_env ${OZONE_REPLICATION_FACTOR}
-
-execute_robot_test datanode compatibility/dn.robot
-execute_robot_test om compatibility/om.robot
-execute_robot_test recon compatibility/recon.robot
-execute_robot_test scm compatibility/scm.robot
-execute_robot_test datanode compatibility/dn-one-rocksdb.robot
+# old cluster with clients: same version and current version
+for cluster_version in ${old_versions}; do
+ export OZONE_VERSION=${cluster_version}
+ COMPOSE_FILE=old-cluster.yaml:clients.yaml test_cross_compatibility
${cluster_version} ${current_version}
+done
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
