Skip to content
Permalink
Browse files

Remove PerfkitBenchMaker

No longer supported.

Change-Id: Iae8ff4e0a1f55af67b49df16e8ecf276877f2525
Signed-off-by: Charles Short <chucks@redhat.com>
  • Loading branch information...
zulcss committed Nov 20, 2019
1 parent a3a3c51 commit 0fa8454fd1e9141af979f20a03d54131852b0f18
Showing with 11 additions and 1,060 deletions.
  1. +1 −2 ansible/install/browbeat.yml
  2. +0 −4 ansible/install/group_vars/all.yml
  3. +0 −4 ansible/install/group_vars/zuul_all.yml
  4. +0 −52 ansible/install/roles/perfkitbenchmarker/tasks/main.yml
  5. +0 −1 ansible/oooq/install-browbeat.yml
  6. +1 −1 ansible/oooq/roles/ci-network/defaults/main.yml
  7. +0 −12 ansible/oooq/roles/template-configs/templates/browbeat-api-ci.yaml.j2
  8. +0 −12 ansible/oooq/roles/template-configs/templates/browbeat-basic.yaml.j2
  9. +0 −12 ansible/oooq/roles/template-configs/templates/browbeat-minimal-ci.yaml.j2
  10. +0 −19 browbeat-complete.yaml
  11. +0 −18 browbeat-config.yaml
  12. +1 −1 browbeat.py
  13. +1 −1 browbeat/config.py
  14. +1 −40 browbeat/schema/browbeat.yml
  15. +0 −48 browbeat/schema/perfkit.yml
  16. +2 −9 browbeat/tools.py
  17. +0 −205 browbeat/workloads/perfkit.py
  18. +0 −12 conf/browbeat-glance-complete.yaml
  19. +0 −12 conf/browbeat-keystone-complete.yaml
  20. +0 −12 conf/browbeat-keystone-minimal.yaml
  21. +0 −12 conf/browbeat-workloads.yml
  22. +0 −12 conf/ceilometer-minimal.yaml
  23. +0 −12 conf/ceilometer-persist-response-timing.yaml
  24. +0 −12 conf/gnocchi-minimal.yaml
  25. +0 −159 conf/perfkit-benchmarks.yaml
  26. +0 −16 conf/quickstart.yml
  27. +0 −12 conf/telemetry-nova-neutron-gnocchi-10k-1000-per-30m.yaml
  28. +0 −12 conf/telemetry-nova-neutron-gnocchi-1k-100-per-30m.yaml
  29. +0 −12 conf/telemetry-nova-neutron-gnocchi-1k-500-per-30m.yaml
  30. +0 −12 conf/telemetry-nova-neutron-gnocchi-5k-500-per-30m.yaml
  31. +0 −12 conf/telemetry-nova-persist-instances-with-network-fip.yaml
  32. +0 −12 conf/telemetry-nova-persist-instances-with-network-volume-fip.yaml
  33. +0 −12 conf/telemetry-nova-persist-instances-with-network-volume.yaml
  34. +0 −12 conf/telemetry-nova-persist-instances-with-network.yaml
  35. +0 −12 conf/telemetry-nova-persist-instances-with-volume.yaml
  36. +0 −12 conf/telemetry-nova-persist-instances.yaml
  37. +0 −2 doc/source/developing.rst
  38. +1 −31 doc/source/usage.rst
  39. +0 −71 elastic/templates/browbeat-perfkit-.json
  40. +0 −76 elastic/v5templates/browbeat-perfkit-.json
  41. +0 −16 tests/data/invalid_browbeat.yml
  42. +0 −12 tests/data/invalid_browbeat_workload.yml
  43. +0 −16 tests/data/valid_browbeat.yml
  44. +0 −13 tests/data/workloads.yml
  45. +1 −1 tests/test_config.py
  46. +1 −1 tox.ini
  47. +1 −1 utils/oooq-browbeat-install.sh
@@ -1,6 +1,6 @@
---
#
# Playbook to install Browbeat (Rally + Shaker + PerfKitBenchmarker) on undercloud
# Playbook to install Browbeat (Rally + Shaker) on undercloud
#

- hosts: browbeat
@@ -11,7 +11,6 @@
- stockpile
- { role: browbeat-results, when: browbeat_results_in_httpd}
- firewall
- { role: perfkitbenchmarker, when: ansible_distribution_major_version < '8'}
- rally
- shaker
- { role: flavors, when: browbeat_create_flavors}
@@ -39,10 +39,6 @@ shaker_venv: "{{browbeat_path}}/.shaker-venv"
# Shaker version to Install
shaker_version: 1.3.1

# PerfKitBenchmarker Settings
perfkit_venv: "{{browbeat_path}}/.perfkit-venv"
perfkit_version: v1.13.0

# Configuration items to adjust browbeat results served through httpd
browbeat_results_port: 9001
browbeat_results_in_httpd: true
@@ -39,10 +39,6 @@ shaker_venv: "{{browbeat_path}}/.shaker-venv"
# Shaker version to Install
shaker_version: 1.1.3

# PerfKitBenchmarker Settings
perfkit_venv: "{{browbeat_path}}/.perfkit-venv"
perfkit_version: v1.13.0

# Configuration items to adjust browbeat results served through httpd
browbeat_results_port: 9001
browbeat_results_in_httpd: true

This file was deleted.

@@ -9,7 +9,6 @@
- browbeat/stockpile
- browbeat/browbeat
- browbeat/firewall
- browbeat/perfkitbenchmarker
- browbeat/rally
- browbeat/shaker
- browbeat/flavors
@@ -1,5 +1,5 @@
---
# Public network that perfkit and shaker utilize
# Public network that shaker utilize
browbeat_pub_net_name: browbeat_public
browbeat_pub_subnet: 1.1.1.1/22
browbeat_pub_pool_start: 1.1.1.1
@@ -26,18 +26,6 @@ grafana:
port: 3000
dashboards:
- openstack-general-system-performance
perfkit:
sleep_before: 0
sleep_after: 0
default:
image: centos7
machine_type: m1.small
os_type: rhel
openstack_image_username: centos
openstack_floating_ip_pool: browbeat_public
openstack_network: browbeat_private
timing_measurements: runtimes
ignore_package_requirements: true
rally:
sleep_before: 5
sleep_after: 5
@@ -28,18 +28,6 @@ grafana:
port: 3000
dashboards:
- openstack-general-system-performance
perfkit:
sleep_before: 0
sleep_after: 0
default:
image: centos7
machine_type: m1.small
os_type: rhel
openstack_image_username: centos
openstack_floating_ip_pool: browbeat_public
openstack_network: browbeat_private
timing_measurements: runtimes
ignore_package_requirements: true
rally:
sleep_before: 5
sleep_after: 5
@@ -28,18 +28,6 @@ grafana:
port: 3000
dashboards:
- openstack-general-system-performance
perfkit:
sleep_before: 0
sleep_after: 0
default:
image: centos7
machine_type: m1.small
os_type: rhel
openstack_image_username: centos
openstack_floating_ip_pool: browbeat_public
openstack_network: browbeat_private
timing_measurements: runtimes
ignore_package_requirements: true
rally:
sleep_before: 5
sleep_after: 5
@@ -27,18 +27,6 @@ grafana:
port: 3000
dashboards:
- openstack-general-system-performance
perfkit:
sleep_before: 0
sleep_after: 0
default:
image: centos7
machine_type: m1.small
os_type: rhel
openstack_image_username: centos
openstack_floating_ip_pool: browbeat_public
openstack_network: browbeat_private
timing_measurements: runtimes
ignore_package_requirements: true
rally:
sleep_before: 5
sleep_after: 5
@@ -58,13 +46,6 @@ shaker:
external_host: 2.2.2.2

workloads:
# PerfKitBenchmarker
- name: fio-centos-m1-small
enabled: false
type: perfkit
benchmarks: fio
openstack_volume_size: 1

# Rally
- name: authenticate
enabled: true
@@ -31,18 +31,6 @@ grafana:
port: 3000
dashboards:
- openstack-general-system-performance
perfkit:
sleep_before: 0
sleep_after: 0
default:
image: centos7
machine_type: m1.small
os_type: rhel
openstack_image_username: centos
openstack_floating_ip_pool: browbeat_public
openstack_network: browbeat_private
timing_measurements: runtimes
ignore_package_requirements: true
rally:
sleep_before: 5
sleep_after: 5
@@ -62,12 +50,6 @@ shaker:
external_host: 2.2.2.2

workloads:
# PerfKitBenchmarker
- name: fio-centos-m1-small
enabled: false
type: perfkit
benchmarks: fio
openstack_volume_size: 1
# file for shaker should be one of https://opendev.org/performa/shaker/src/branch/master/shaker/scenarios/openstack
# Shaker
- name: shaker-l2
@@ -24,7 +24,7 @@
from browbeat.config import load_browbeat_config
from browbeat.path import results_path

_workload_opts = ['perfkit', 'rally', 'shaker']
_workload_opts = ['rally', 'shaker']
_config_file = 'browbeat-config.yaml'
debug_log_file = 'log/debug.log'

@@ -44,7 +44,7 @@ def load_browbeat_config(path):
def _validate_yaml(schema, config):
"""Raises exception if config is invalid.
:param schema: The schema to validate with (browbeat, perfkit, rally...)
:param schema: The schema to validate with (browbeat, rally...)
:param config: Loaded yaml to validate
"""
check = pykwalify_core.Core(
@@ -78,45 +78,6 @@ mapping:
port:
type: int
required: True
perfkit:
required: True
type: map
mapping:
default:
type: map
required: True
mapping:
image:
type: str
required: True
machine_type:
type: str
required: True
os_type:
type: str
required: True
enum: ['rhel', 'debian', 'ubuntu_container', 'windows']
openstack_image_username:
type: str
required: True
openstack_floating_ip_pool:
type: str
required: True
openstack_network:
type: str
required: True
ignore_package_requirements:
type: bool
required: False
timing_measurements:
type: str
required: False
sleep_after:
type: number
required: True
sleep_before:
type: number
required: True
rally:
required: True
type: map
@@ -181,4 +142,4 @@ mapping:
type:
type: str
required: True
enum: ['perfkit', 'rally', 'shaker']
enum: ['rally', 'shaker']

This file was deleted.

@@ -16,7 +16,6 @@
import re
import subprocess

from browbeat.workloads import perfkit
from browbeat.workloads import rally
from browbeat.workloads import shaker

@@ -62,9 +61,7 @@ def run_workload(self, workload, result_dir_ts, run_iteration):
:param result_dir_ts: Result directory timestamp
:param run_iteration: Iteration for a specific run
"""
if workload["type"] == "perfkit":
workloads = perfkit.PerfKit(self.config, result_dir_ts)
elif workload["type"] == "rally":
if workload["type"] == "rally":
workloads = rally.Rally(self.config, result_dir_ts)
elif workload["type"] == "shaker":
workloads = shaker.Shaker(self.config, result_dir_ts)
@@ -98,8 +95,7 @@ def gather_metadata(self):
def post_process(self, cli):
workloads = {}
workloads['shaker'] = re.compile("shaker")
workloads['perfkit'] = re.compile("perfkit")
workloads['rally'] = re.compile("(?!perfkit)|(?!shaker)")
workloads['rally'] = re.compile("(?!shaker)")
""" Iterate through dir structure """
results = {}
if os.path.isdir(cli.path):
@@ -138,6 +134,3 @@ def post_process(self, cli):
if workload is "shaker":
# Stub for Shaker.
continue
if workload is "perfkit":
# Stub for PerfKit.
continue

0 comments on commit 0fa8454

Please sign in to comment.
You can’t perform that action at this time.