Fix install_command in tox.ini

Co-Authored-By: zhurong <aaronzhu1121@gmail.com>
Change-Id: Ib727161e05e1a837c5a1a0a968b2488ec9815eca

requirements.txt

@@ -34,3 +34,6 @@ stevedore>=1.9.0 # Apache-2.0
 tenacity>=3.2.1  # Apache-2.0
 tooz[zake]>=1.47.0 # Apache-2.0
 os-xenapi>=0.1.1 # Apache-2.0
+oslo.cache>=1.5.0 # Apache-2.0
+gnocchiclient>=7.0.0 # Apache-2.0
+python-zaqarclient>=1.0.0 # Apache-2.0

setup.cfg

@@ -30,13 +30,6 @@ packages =
 data_files =
     etc/ceilometer = etc/ceilometer/*
 
-[extras]
-gnocchi =
-    oslo.cache>=1.5.0 # Apache-2.0
-    gnocchiclient>=7.0.0 # Apache-2.0
-zaqar =
-    python-zaqarclient>=1.0.0 # Apache-2.0
-
 [entry_points]
 ceilometer.notification.pipeline =
     meter = ceilometer.pipeline.sample:SamplePipelineManager

tox.ini

@@ -4,10 +4,10 @@ skipsdist = True
 envlist = py27,pep8
 
 [testenv]
-deps = .[gnocchi,zaqar]
-       -r{toxinidir}/test-requirements.txt
-# NOTE(tonyb): This project has chosen to *NOT* consume upper-constraints.txt
-install_command = pip install -U {opts} {packages}
+deps = -r{toxinidir}/test-requirements.txt
+       -r{toxinidir}/requirements.txt
+       -c{env:UPPER_CONSTRAINTS_FILE:https://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt}
+install_command = pip install {opts} {packages}
 usedevelop = True
 setenv = VIRTUAL_ENV={envdir}
          CEILOMETER_TEST_BACKEND={env:CEILOMETER_TEST_BACKEND:none}