Update benchmark_sets.py

zhaowangdaren · Dec 10, 2015 · b084086 · b084086
1 parent f541af8
commit b084086
Showing 1 changed file with 11 additions and 5 deletions.
diff --git a/perfkitbenchmarker/benchmark_sets.py b/perfkitbenchmarker/benchmark_sets.py
@@ -31,11 +31,11 @@
         MESSAGE: ('The standard_set is a community agreed upon set of '
                   'benchmarks to measure Cloud performance.'),
         BENCHMARK_LIST: [
-            'aerospike', 'cassandra_stress', 'object_storage_service',
+            'aerospike', 'block_storage_workload', 'cassandra_stress',
             'cluster_boot', 'copy_throughput', 'coremark', 'fio',
-            'hadoop_terasort', 'hpcc', 'iperf', 'mesh_network', 'mongodb_ycsb',
-            'netperf', 'ping', 'redis', 'speccpu2006', 'block_storage_workload',
-            'sysbench_oltp', 'unixbench']
+            'hadoop_terasort', 'hpcc', 'iperf', 'mesh_network',
+            'mongodb_ycsb', 'netperf', 'object_storage_service', 'ping',
+            'redis', 'speccpu2006', 'sysbench_oltp', 'unixbench']
     },
     'arm_set': {
         MESSAGE: 'ARM benchmark set.',
@@ -78,7 +78,13 @@
     'google_set': {
         MESSAGE: ('This benchmark set is maintained by Google Cloud Platform '
                   'Performance Team.'),
-        BENCHMARK_LIST: [STANDARD_SET, 'oldisim', 'tomcat_wrk']
+        BENCHMARK_LIST: [
+            'aerospike_ycsb', 'block_storage_workload', 'cassandra_stress',
+            'cassandra_ycsb', 'cluster_boot', 'copy_throughput',
+            'fio', 'hadoop_terasort', 'hpcc', 'iperf', 'mesh_network',
+            'mongodb_ycsb', 'netperf', 'object_storage_service', 'oldisim',
+            'ping', 'redis_ycsb', 'speccpu2006', 'sysbench_oltp', 'tomcat_wrk',
+            'unixbench']
     },
     'intel_set': {
         MESSAGE: 'Intel benchmark set.',