Skip to content

Commit b6b81d0

Browse files
author
Prajwal
committed
Fix py package versions
Change-Id: If017559bb7d4318b029c53ef2d019a403dbc4603 Reviewed-on: http://review.couchbase.org/c/perfrunner/+/134076 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: <sharujayaram@gmail.com>
1 parent 609c5f3 commit b6b81d0

3 files changed

Lines changed: 20 additions & 13 deletions

File tree

perfrunner/celerylocal.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
BROKER_URL = 'sqla+sqlite:///perfrunner.db'
2-
CELERY_RESULT_BACKEND = 'database'
3-
CELERY_RESULT_DBURI = 'sqlite:///results.db'
1+
broker_url = 'sqla+sqlite:///perfrunner.db'
2+
result_backend = 'database'
3+
database_url = 'sqlite:///results.db'
4+
task_serializer = 'pickle'
5+
result_serializer = 'pickle'
6+
accept_content = {'pickle'}

perfrunner/celeryremote.py

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
BROKER_URL = 'amqp://couchbase:couchbase@172.23.97.73:5672/broker'
2-
BROKER_POOL_LIMIT = None
3-
CELERY_RESULT_BACKEND = 'amqp'
4-
CELERY_RESULT_EXCHANGE = 'perf_results'
5-
CELERY_RESULT_PERSISTENT = False
6-
CELERYD_HIJACK_ROOT_LOGGER = False
1+
broker_url = 'amqp://couchbase:couchbase@172.23.97.73:5672/broker'
2+
broker_pool_limit = None
3+
worker_hijack_root_logger = False
4+
result_backend = "amqp://"
5+
result_persistent = False
6+
result_exchange = "perf_results"
7+
accept_content = ['pickle']
8+
result_serializer = 'pickle'
9+
task_serializer = 'pickle'

requirements.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
ansible==2.5.2
22
aiohttp==2.2.5
3-
awscli==1.10.58
4-
billiard==3.5.0.2
3+
awscli==1.11.136
4+
billiard==3.6.3.0
55
boto3==1.4.6
66
botocore==1.6.3
7-
celery==3.1.25
7+
celery==4.4.7
88
cffi==1.7.0
99
couchbase==2.5.0
1010
coverage==4.4.1
@@ -25,13 +25,14 @@ pycrypto==2.6.1
2525
python-dateutil==2.6.1
2626
python-jenkins==1.0.0
2727
python-snappy==0.5.1
28-
requests==2.18.4
28+
requests==2.24.0
2929
spooky==2.0.0
3030
sqlalchemy==1.1.7
3131
sshtunnel==0.1.3
3232
twisted==16.2.0
3333
validators==0.12.0
3434
xmltodict==0.11.0
35+
pyYAML==3.12
3536

3637
git+https://github.com/couchbaselabs/mc_bin_client.git@magma#egg=mc_bin_client
3738
git+https://github.com/mattrobenolt/jinja2-cli.git#egg=jinja2-cli

0 commit comments

Comments
 (0)