Permalink
Browse files

Fix python3.7 import errors and made job voting

Python3.7 finally removed relative imports so we adopt the correct
syntax and also making py37 job voting to avoid regressions.

Change-Id: I16e01344e8ae1c732c31264c50d6dd57143ea799
  • Loading branch information...
ssbarnea authored and aakarshgopi committed Nov 12, 2018
1 parent 7c3aed6 commit 8f338e08c2dba79e34bb79f35d0c9b082d3e530b
Showing with 40 additions and 37 deletions.
  1. +1 −1 .zuul.yaml
  2. +8 −8 browbeat/perfkit.py
  3. +7 −8 browbeat/rally.py
  4. +8 −8 browbeat/shaker.py
  5. +5 −5 browbeat/tools.py
  6. +6 −6 browbeat/yoda.py
  7. +5 −1 tox.ini
@@ -2,7 +2,7 @@
- project:
templates:
- docs-on-readthedocs
- openstack-python37-jobs-nonvoting
- openstack-python37-jobs
- openstack-python36-jobs
vars:
rtd_webhook_id: '51626'
@@ -19,13 +19,13 @@
import subprocess
import time
import elastic
import grafana
from path import get_overcloudrc
from path import get_workload_venv
from path import results_path
import tools
import workloadbase
import browbeat.tools
from browbeat import elastic
from browbeat import grafana
from browbeat import workloadbase
from browbeat.path import get_overcloudrc
from browbeat.path import get_workload_venv
from browbeat.path import results_path
class PerfKit(workloadbase.WorkloadBase):
@@ -34,7 +34,7 @@ def __init__(self, config, result_dir_ts):
self.overcloudrc = get_overcloudrc()
self.config = config
self.result_dir_ts = result_dir_ts
self.tools = tools.Tools(self.config)
self.tools = browbeat.tools.Tools(self.config)
self.grafana = grafana.Grafana(self.config)
self.elastic = elastic.Elastic(self.config, self.__class__.__name__.lower())
@@ -20,21 +20,20 @@
import shutil
import time
import elastic
import grafana
from path import get_workload_venv
from path import results_path
import workloadbase
import tools
import browbeat.tools
from browbeat import elastic
from browbeat import grafana
from browbeat import workloadbase
from browbeat.path import get_workload_venv
from browbeat.path import results_path
class Rally(workloadbase.WorkloadBase):
def __init__(self, config, result_dir_ts):
self.logger = logging.getLogger('browbeat.rally')
self.config = config
self.result_dir_ts = result_dir_ts
self.tools = tools.Tools(self.config)
self.tools = browbeat.tools.Tools(self.config)
self.grafana = grafana.Grafana(self.config)
self.elastic = elastic.Elastic(self.config, self.__class__.__name__.lower())
@@ -19,13 +19,13 @@
import uuid
import yaml
import elastic
import grafana
from path import get_overcloudrc
from path import get_workload_venv
from path import results_path
import workloadbase
import tools
import browbeat.tools
from browbeat import elastic
from browbeat import grafana
from browbeat import workloadbase
from browbeat.path import get_overcloudrc
from browbeat.path import get_workload_venv
from browbeat.path import results_path
class Shaker(workloadbase.WorkloadBase):
@@ -35,7 +35,7 @@ def __init__(self, config, result_dir_ts):
self.overcloudrc = get_overcloudrc()
self.config = config
self.result_dir_ts = result_dir_ts
self.tools = tools.Tools(self.config)
self.tools = browbeat.tools.Tools(self.config)
self.grafana = grafana.Grafana(self.config)
self.elastic = elastic.Elastic(self.config, self.__class__.__name__.lower())
@@ -16,10 +16,10 @@
import re
import subprocess
import perfkit
import rally
import shaker
import yoda
from browbeat import perfkit
from browbeat import rally
from browbeat import shaker
from browbeat import yoda
class Tools(object):
@@ -51,7 +51,7 @@ def run_cmd(self, cmd):
stderr=subprocess.PIPE)
stdout, stderr = process.communicate()
output_dict = {}
output_dict['stdout'] = stdout.strip()
output_dict['stdout'] = stdout.strip().decode()
output_dict['stderr'] = stderr.strip()
output_dict['rc'] = process.returncode
if process.returncode > 0:
@@ -28,11 +28,11 @@
ostag = None
import requests
import elastic
import grafana
from path import results_path
import workloadbase
import tools
import browbeat.tools
from browbeat import elastic
from browbeat import grafana
from browbeat import workloadbase
from browbeat.path import results_path
class Yoda(workloadbase.WorkloadBase):
@@ -41,7 +41,7 @@ def __init__(self, config, result_dir_ts):
self.logger = logging.getLogger('browbeat.yoda')
self.config = config
self.result_dir_ts = result_dir_ts
self.tools = tools.Tools(self.config)
self.tools = browbeat.tools.Tools(self.config)
self.grafana = grafana.Grafana(self.config)
self.elastic = elastic.Elastic(self.config, self.__class__.__name__.lower())
self.error_count = 0
@@ -1,6 +1,6 @@
[tox]
minversion = 2.0
envlist = py27,py35,py36,linters,dist,insights
envlist = py27,py35,py36,py37,linters,dist,insights
skipsdist = True
[testenv]
@@ -62,6 +62,10 @@ commands = pytest {posargs}
basepython = python3.6
commands = pytest {posargs}
[testenv:py37]
basepython = python3.7
commands = pytest {posargs}
[testenv:cover]
commands = python setup.py test --coverage --testr-args={posargs}

0 comments on commit 8f338e0

Please sign in to comment.