Update PerfKitBenchmarker to v1.12.0 and small fix

* Small fix for PerfKitBenchmarker results directory
* Update to v1.12.0 PerfKitBenchmarker
* Fix which requirements are needed inside perfkit-venv

Change-Id: Icfc497a6fe411691f8bf33c1a34e3c807c627344

ansible/install/group_vars/all.yml

@@ -41,7 +41,7 @@ shaker_version: 0.0.17
 
 # PerfKitBenchmarker Settings
 perfkit_venv: "{{home_dir}}/perfkit-venv"
-perfkit_version: v1.7.0
+perfkit_version: v1.12.0
 
 # Configuration items to adjust browbeat results served through httpd
 browbeat_results_port: 9001

ansible/install/roles/perfkitbenchmarker/tasks/main.yml

@@ -37,10 +37,14 @@
      requirements: "{{ perfkit_venv }}/PerfKitBenchmarker/perfkitbenchmarker/providers/openstack/requirements.txt"
      virtualenv: "{{perfkit_venv}}"
 
-# (akrzos) - Using 2.6 seems most stable, Using latest or >2.6 as per PerfKitBenchmarker
-# openstack/requirements.txt results in an openstack cli error.
-- name: Downgrade python-openstackclient inside perfkit-venv
+# (akrzos) - These requirements are what works for OpenStack Ocata
+- name: Fix requirements for (OSP11 Ocata) inside perfkit-venv
   pip:
-    name: python-openstackclient
-    version: 2.6.0
+    name: "{{item.name}}"
+    version: "{{item.version}}"
     virtualenv: "{{perfkit_venv}}"
+  with_items:
+    - name: python-openstackclient
+      version: 3.8.1
+    - name: python-novaclient
+      version: 7.1.0

browbeat-complete.yaml

@@ -52,6 +52,7 @@ perfkit:
     openstack_floating_ip_pool: browbeat_public
     openstack_network: browbeat_private
     timing_measurements: runtimes
+    ignore_package_requirements: true
   benchmarks:
     - name: fio-centos-m1-small
       enabled: false

browbeat-config.yaml

@@ -52,6 +52,7 @@ perfkit:
     openstack_floating_ip_pool: browbeat_public
     openstack_network: browbeat_private
     timing_measurements: runtimes
+    ignore_package_requirements: true
   benchmarks:
     - name: fio-centos-m1-small
       enabled: false

conf/perfkit-benchmarks.yaml

@@ -57,6 +57,7 @@ perfkit:
     openstack_floating_ip_pool: browbeat_public
     openstack_network: browbeat_private
     timing_measurements: runtimes
+    ignore_package_requirements: true
   benchmarks:
     - name: aerospike-centos-m1-small
       enabled: false

lib/PerfKit.py

@@ -213,7 +213,8 @@ class PerfKit(WorkloadBase.WorkloadBase):
                         self.update_tests()
                         self.update_total_tests()
                         result_dir = self.tools.create_results_dir(
-                            self.config['browbeat']['results'], time_stamp, benchmark['name'], run)
+                            self.config['browbeat']['results'], time_stamp, benchmark['name'],
+                            str(run))
                         test_name = "{}-{}-{}".format(time_stamp, benchmark['name'], run)
                         workload = self.__class__.__name__
                         self.workload_logger(result_dir, workload)