Browse Source

Add broken tags to ffead tests (#5300)

* Update mysql odbc connector url

* Add broken tags to ffead tests

* tag all tests
Nate 5 years ago
parent
commit
a78caea2b5

+ 30 - 15
frameworks/C++/ffead-cpp/benchmark_config.json

@@ -21,7 +21,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-mongo",
 			"display_name": "ffead-cpp-mongo",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"mysql": {
 		"mysql": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -43,7 +44,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-mysql",
 			"display_name": "ffead-cpp-mysql",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"postgresql": {
 		"postgresql": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -65,7 +67,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-postgresql",
 			"display_name": "ffead-cpp-postgresql",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"apache-mongo": {
 		"apache-mongo": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -87,7 +90,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-apache-mongo",
 			"display_name": "ffead-cpp-apache-mongo",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"apache-mysql": {
 		"apache-mysql": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -109,7 +113,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-apache-mysql",
 			"display_name": "ffead-cpp-apache-mysql",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"apache-postgresql": {
 		"apache-postgresql": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -131,7 +136,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-apache-postgresql",
 			"display_name": "ffead-cpp-apache-postgresql",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"nginx-mongo": {
 		"nginx-mongo": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -153,7 +159,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-nginx-mongo",
 			"display_name": "ffead-cpp-nginx-mongo",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"nginx-mysql": {
 		"nginx-mysql": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -175,7 +182,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-nginx-mysql",
 			"display_name": "ffead-cpp-nginx-mysql",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"nginx-postgresql": {
 		"nginx-postgresql": {
 			"json_url": "/te-benchmark/json",
 			"json_url": "/te-benchmark/json",
@@ -197,7 +205,8 @@
 			"database_os": "Linux",
 			"database_os": "Linux",
 			"display_name": "ffead-cpp-nginx-postgresql",
 			"display_name": "ffead-cpp-nginx-postgresql",
 			"notes": "",
 			"notes": "",
-			"versus": ""
+			"versus": "",
+			"tags": ["broken"]
 		},
 		},
 		"redis": {
 		"redis": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -216,7 +225,8 @@
 			"display_name": "ffead-cpp-mongo-redis",
 			"display_name": "ffead-cpp-mongo-redis",
 			"notes": "",
 			"notes": "",
 			"versus": "",
 			"versus": "",
-			"wait_before_sending_requests": 10
+			"wait_before_sending_requests": 10,
+			"tags": ["broken"]
 		},
 		},
 		"nginx-redis": {
 		"nginx-redis": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -235,7 +245,8 @@
 			"display_name": "ffead-cpp-nginx-mongo-redis",
 			"display_name": "ffead-cpp-nginx-mongo-redis",
 			"notes": "",
 			"notes": "",
 			"versus": "",
 			"versus": "",
-			"wait_before_sending_requests": 10
+			"wait_before_sending_requests": 10,
+			"tags": ["broken"]
 		},
 		},
 		"apache-redis": {
 		"apache-redis": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -254,7 +265,8 @@
 			"display_name": "ffead-cpp-apache-mongo-redis",
 			"display_name": "ffead-cpp-apache-mongo-redis",
 			"notes": "",
 			"notes": "",
 			"versus": "",
 			"versus": "",
-			"wait_before_sending_requests": 10
+			"wait_before_sending_requests": 10,
+			"tags": ["broken"]
 		},
 		},
 		"memcached": {
 		"memcached": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -273,7 +285,8 @@
 			"display_name": "ffead-cpp-mongo-memcached",
 			"display_name": "ffead-cpp-mongo-memcached",
 			"notes": "",
 			"notes": "",
 			"versus": "",
 			"versus": "",
-			"wait_before_sending_requests": 10
+			"wait_before_sending_requests": 10,
+			"tags": ["broken"]
 		},
 		},
 		"nginx-memcached": {
 		"nginx-memcached": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -292,7 +305,8 @@
 			"display_name": "ffead-cpp-nginx-mongo-memcached",
 			"display_name": "ffead-cpp-nginx-mongo-memcached",
 			"notes": "",
 			"notes": "",
 			"versus": "",
 			"versus": "",
-			"wait_before_sending_requests": 10
+			"wait_before_sending_requests": 10,
+			"tags": ["broken"]
 		},
 		},
 		"apache-memcached": {
 		"apache-memcached": {
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
 			"cached_query_url": "/te-benchmark/cached-worlds?count=",
@@ -311,7 +325,8 @@
 			"display_name": "ffead-cpp-apache-mongo-memcached",
 			"display_name": "ffead-cpp-apache-mongo-memcached",
 			"notes": "",
 			"notes": "",
 			"versus": "",
 			"versus": "",
-			"wait_before_sending_requests": 10
+			"wait_before_sending_requests": 10,
+			"tags": ["broken"]
 		}
 		}
 	}]
 	}]
 }
 }

+ 1 - 1
frameworks/C++/ffead-cpp/install_ffead-cpp-dependencies.sh

@@ -14,7 +14,7 @@ service redis-server stop
 
 
 # libmyodbc has been removed from apt
 # libmyodbc has been removed from apt
 
 
-wget -q http://www.mirrorservice.org/sites/ftp.mysql.com/Downloads/Connector-ODBC/5.3/mysql-connector-odbc-5.3.11-linux-ubuntu16.04-x86-64bit.tar.gz
+wget -q https://cdn.mysql.com/archives/mysql-connector-odbc-5.3/mysql-connector-odbc-5.3.11-linux-ubuntu16.04-x86-64bit.tar.gz
 tar xf mysql-connector-odbc-5.3.11-linux-ubuntu16.04-x86-64bit.tar.gz
 tar xf mysql-connector-odbc-5.3.11-linux-ubuntu16.04-x86-64bit.tar.gz
 mkdir -p /usr/lib/x86_64-linux-gnu/odbc
 mkdir -p /usr/lib/x86_64-linux-gnu/odbc
 mv mysql-connector-odbc-5.3.11-linux-ubuntu16.04-x86-64bit/lib/libmyodbc5* /usr/lib/x86_64-linux-gnu/odbc/
 mv mysql-connector-odbc-5.3.11-linux-ubuntu16.04-x86-64bit/lib/libmyodbc5* /usr/lib/x86_64-linux-gnu/odbc/

+ 11 - 0
frameworks/C++/ffead-cpp/install_ffead-cpp-framework.sh

@@ -31,6 +31,17 @@ cp -f ${TROOT}/server.sh script/
 cp -rf ${TROOT}/te-benchmark web/
 cp -rf ${TROOT}/te-benchmark web/
 sed -i 's|THRD_PSIZ=6|THRD_PSIZ='${SERV_THREADS}'|g' resources/server.prop
 sed -i 's|THRD_PSIZ=6|THRD_PSIZ='${SERV_THREADS}'|g' resources/server.prop
 sed -i 's|W_THRD_PSIZ=2|W_THRD_PSIZ='${WRIT_THREADS}'|g' resources/server.prop
 sed -i 's|W_THRD_PSIZ=2|W_THRD_PSIZ='${WRIT_THREADS}'|g' resources/server.prop
+sed -i 's|ENABLE_CRS=true|ENABLE_CRS=false|g' resources/server.prop
+sed -i 's|ENABLE_SEC=true|ENABLE_SEC=false|g' resources/server.prop
+sed -i 's|ENABLE_FLT=true|ENABLE_FLT=false|g' resources/server.prop
+sed -i 's|ENABLE_CNT=false|ENABLE_CNT=true|g' resources/server.prop
+sed -i 's|ENABLE_CNT_MPG=true|ENABLE_CNT_MPG=false|g' resources/server.prop
+sed -i 's|ENABLE_CNT_PTH=true|ENABLE_CNT_PTH=false|g' resources/server.prop
+sed -i 's|ENABLE_CNT_EXT=true|ENABLE_CNT_EXT=false|g' resources/server.prop
+sed -i 's|ENABLE_CNT_RST=false|ENABLE_CNT_RST=true|g' resources/server.prop
+sed -i 's|ENABLE_EXT=false|ENABLE_EXT=true|g' resources/server.prop
+sed -i 's|ENABLE_SCR=true|ENABLE_SCR=false|g' resources/server.prop
+sed -i 's|ENABLE_SWS=true|ENABLE_SWS=false|g' resources/server.prop
 sed -i 's|LOGGING_ENABLED=true|LOGGING_ENABLED=false|g' resources/server.prop
 sed -i 's|LOGGING_ENABLED=true|LOGGING_ENABLED=false|g' resources/server.prop
 
 
 rm -rf web/default web/oauthApp web/flexApp web/markers
 rm -rf web/default web/oauthApp web/flexApp web/markers