From 86a4e778d6e19e2566727a367d50e57bec0c5b7c Mon Sep 17 00:00:00 2001 From: Lukas Joswiak Date: Fri, 15 Apr 2022 14:38:49 -0700 Subject: [PATCH 1/3] Enable Arm architecture in end-to-end upgrade tests --- tests/TestRunner/upgrade_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestRunner/upgrade_test.py b/tests/TestRunner/upgrade_test.py index a4a201e3db..15b215d73d 100755 --- a/tests/TestRunner/upgrade_test.py +++ b/tests/TestRunner/upgrade_test.py @@ -18,7 +18,7 @@ from urllib import request from local_cluster import LocalCluster, random_secret_string -SUPPORTED_PLATFORMS = ["x86_64"] +SUPPORTED_PLATFORMS = ["x86_64", "aarch64"] SUPPORTED_VERSIONS = ["7.2.0", "7.1.0", "7.0.0", "6.3.24", "6.3.23", "6.3.22", "6.3.18", "6.3.17", "6.3.16", "6.3.15", "6.3.13", "6.3.12", "6.3.9", "6.2.30", "6.2.29", "6.2.28", "6.2.27", "6.2.26", "6.2.25", "6.2.24", "6.2.23", "6.2.22", "6.2.21", From 7b737e91a111cc67b18bcedfe972d5d4dba900be Mon Sep 17 00:00:00 2001 From: Lukas Joswiak Date: Fri, 15 Apr 2022 16:09:33 -0700 Subject: [PATCH 2/3] Disable upgrade tests an non-x86_64 architectures --- bindings/c/CMakeLists.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/bindings/c/CMakeLists.txt b/bindings/c/CMakeLists.txt index ab8aec1402..3f1d12c6ad 100644 --- a/bindings/c/CMakeLists.txt +++ b/bindings/c/CMakeLists.txt @@ -253,25 +253,25 @@ endif() ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests ) -if(NOT USE_SANITIZER) - add_test(NAME fdb_c_upgrade_single_threaded + if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND NOT USE_SANITIZER) + add_test(NAME fdb_c_upgrade_single_threaded COMMAND ${CMAKE_SOURCE_DIR}/tests/TestRunner/upgrade_test.py --build-dir ${CMAKE_BINARY_DIR} --disable-log-dump --test-file ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests/upgrade/MixedApiWorkloadSingleThr.toml --upgrade-path "6.3.23" "7.0.0" "6.3.23" --process-number 1 - ) + ) - add_test(NAME fdb_c_upgrade_multi_threaded - COMMAND ${CMAKE_SOURCE_DIR}/tests/TestRunner/upgrade_test.py - --build-dir ${CMAKE_BINARY_DIR} - --disable-log-dump - --test-file ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests/upgrade/MixedApiWorkloadMultiThr.toml - --upgrade-path "6.3.23" "7.0.0" "6.3.23" - --process-number 3 - ) -endif() + add_test(NAME fdb_c_upgrade_multi_threaded + COMMAND ${CMAKE_SOURCE_DIR}/tests/TestRunner/upgrade_test.py + --build-dir ${CMAKE_BINARY_DIR} + --disable-log-dump + --test-file ${CMAKE_SOURCE_DIR}/bindings/c/test/apitester/tests/upgrade/MixedApiWorkloadMultiThr.toml + --upgrade-path "6.3.23" "7.0.0" "6.3.23" + --process-number 3 + ) + endif() endif() From 01807502caa45d51df6364d28ba4838f3437888f Mon Sep 17 00:00:00 2001 From: Lukas Joswiak Date: Fri, 15 Apr 2022 16:10:16 -0700 Subject: [PATCH 3/3] Remove Arm support --- tests/TestRunner/upgrade_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/TestRunner/upgrade_test.py b/tests/TestRunner/upgrade_test.py index 15b215d73d..a4a201e3db 100755 --- a/tests/TestRunner/upgrade_test.py +++ b/tests/TestRunner/upgrade_test.py @@ -18,7 +18,7 @@ from urllib import request from local_cluster import LocalCluster, random_secret_string -SUPPORTED_PLATFORMS = ["x86_64", "aarch64"] +SUPPORTED_PLATFORMS = ["x86_64"] SUPPORTED_VERSIONS = ["7.2.0", "7.1.0", "7.0.0", "6.3.24", "6.3.23", "6.3.22", "6.3.18", "6.3.17", "6.3.16", "6.3.15", "6.3.13", "6.3.12", "6.3.9", "6.2.30", "6.2.29", "6.2.28", "6.2.27", "6.2.26", "6.2.25", "6.2.24", "6.2.23", "6.2.22", "6.2.21",