From 51953755bb3e30c9c5dfa918c16f3bf29c23530b Mon Sep 17 00:00:00 2001
From: Alex Krzos <akrzos@redhat.com>
Date: Thu, 10 Mar 2016 08:32:07 -0500
Subject: [PATCH] More PerfKit Benchmarks

Change-Id: I940ad14fa66d861207fa178674f68fac108af6ab
---
 README.md                           |  2 +-
 conf/browbeat-perfkit-complete.yaml | 52 ++++++++++++++++++++++++++++-
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 4feca80e0..ebe9646e9 100644
--- a/README.md
+++ b/README.md
@@ -133,7 +133,7 @@ Your Overcloud check output is located in check/bug_report.log
 
 # Running PerfKitBenchmarker
 
-Work is on-going to utilize PerfKitBenchmarker as a workload provider to browbeat.  Many benchmarks work out of the box with browbeat.  You must ensure that your network is setup correctly to run those benchmarks and you will need to configure the settings in ansible/install/group_vars/all for browbeat public/private networks. Currently  tested benchmarks include: bonnie++, cluster_boot, copy_throughput(cp,dd,scp), fio, iperf, netperf, mesh_network, mongodb_ycsb, ping, and sysbench_oltp.
+Work is on-going to utilize PerfKitBenchmarker as a workload provider to browbeat.  Many benchmarks work out of the box with browbeat.  You must ensure that your network is setup correctly to run those benchmarks and you will need to configure the settings in ansible/install/group_vars/all for browbeat public/private networks. Currently  tested benchmarks include: aerospike, bonnie++, cluster_boot, copy_throughput(cp,dd,scp), fio, iperf, mesh_network, mongodb_ycsb, netperf, object_storage_service, ping, scimark2, and sysbench_oltp.
 
 To run browbeat's PerfKit Benchmarks, you can start by viewing the tested benchmark's configuration in conf/browbeat-perfkit-complete.yaml. You must add them to your specific browbeat config yaml file or enable/disable the benchmarks you wish to run in the default config file (browbeat-config.yaml).  There are many flags exposed in the configuration files to tune how those benchmarks run.  Additional flags are exposed in the soruce code of PerfKitBenchmarker available: https://github.com/GoogleCloudPlatform/PerfKitBenchmarker
 
diff --git a/conf/browbeat-perfkit-complete.yaml b/conf/browbeat-perfkit-complete.yaml
index 2ecad7800..971a059d0 100644
--- a/conf/browbeat-perfkit-complete.yaml
+++ b/conf/browbeat-perfkit-complete.yaml
@@ -41,6 +41,24 @@ perfkit:
     openstack_public_network: browbeat_public
     openstack_private_network: browbeat_private
   benchmarks:
+    - name: aerospike-centos-m1-small
+      enabled: false
+      benchmarks: aerospike
+    - name: block_storage_workload-centos-m1-small
+      enabled: false
+      benchmarks: block_storage_workload
+      data_disk_size: 20
+      workload_mode: logging
+    - name: block_storage_workload-centos-m1-small
+      enabled: false
+      benchmarks: block_storage_workload
+      data_disk_size: 20
+      workload_mode: database
+    - name: block_storage_workload-centos-m1-small
+      enabled: true
+      benchmarks: block_storage_workload
+      data_disk_size: 20
+      workload_mode: streaming
     - name: bonnie-centos-m1-small
       enabled: false
       benchmarks: bonnie++
@@ -74,6 +92,14 @@ perfkit:
       enabled: false
       benchmarks: fio
       data_disk_size: 4
+    - name: fio-centos-m1-small-10m
+      enabled: false
+      benchmarks: fio
+      data_disk_size: 10
+      config_override: "fio.vm_groups.default.vm_count=2"
+      fio_generate_scenarios: all
+      fio_run_for_minutes: 10
+      fio_working_set_size: 4
     - name: iperf-centos-m1-small
       enabled: false
       benchmarks: iperf
@@ -81,7 +107,6 @@ perfkit:
       enabled: false
       benchmarks: mesh_network
       num_vms: 3
-    # selinux affects this benchmark:
     - name: mongodb_ycsb-centos-m1-small
       enabled: false
       benchmarks: mongodb_ycsb
@@ -89,10 +114,35 @@ perfkit:
       num_striped_disks: 1
       ycsb_client_vms: 1
       mongodb_writeconcern: acknowledged
+    - name: netperf-centos-m1-small
+      enabled: false
+      benchmarks: netperf
+    - name: object_storage_service-centos-m1-small
+      enabled: false
+      benchmarks: object_storage_service
+      storage: OpenStack
+      object_storage_scenario: all
+      openstack_swift_insecure: true
+      data_disk_size: 10
     - name: ping-centos-m1-small
       enabled: false
       benchmarks: ping
+    - name: redis-centos-m1-small
+      enabled: false
+      benchmarks: redis
+      redis_clients: 2
+    - name: redis_ycsb-centos-m1-small
+      enabled: false
+      benchmarks: redis_ycsb
+      ycsb_client_vms: 2
+    - name: scimark2-centos-m1-small
+      enabled: false
+      benchmarks: scimark2
     - name: sysbench_oltp-centos-m1-small
       enabled: false
       benchmarks: sysbench_oltp
       data_disk_size: 20
+    - name: unixbench-centos-m1-small
+      enabled: false
+      benchmarks: unixbench
+      data_disk_size: 10
\ No newline at end of file