Update requirements and pin pyzmq

pyzmq version 15.0.0 requires C++ compiler to be present on system;
for Shaker use case it would be enough to use version 14.x.x

image builder templates are also updated, legacy netperf-wrapper
is not installed any longer

Change-Id: I0e2e6ac3cbbb966b0f4430591e3c89107e25db0a

requirements-agent.txt

@@ -2,14 +2,14 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=0.6,!=0.7,<1.0
+pbr>=1.6
 
-oslo.concurrency>=1.4.1         # Apache-2.0
+oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.config>=1.6.0  # Apache-2.0
+oslo.config>=2.6.0 # Apache-2.0
-oslo.i18n>=1.3.0  # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=0.4.0  # Apache-2.0
+oslo.log>=1.12.0 # Apache-2.0
-oslo.serialization>=1.2.0               # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=1.2.0                       # Apache-2.0
+oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0
-psutil>=1.1.1,<2.0.0
+psutil<2.0.0,>=1.1.1
 PyYAML>=3.1.0
-pyzmq>=14.3.1 # LGPL+BSD
+pyzmq<15.0.0,>=14.3.1 # LGPL+BSD

requirements.txt

@@ -2,23 +2,23 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr<2.0,>=1.3
+pbr>=1.6
 
 iso8601>=0.1.9
 Jinja2>=2.6 # BSD License (3 clause)
 oslo.concurrency>=2.3.0 # Apache-2.0
-oslo.config>=1.11.0 # Apache-2.0
+oslo.config>=2.6.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=1.8.0 # Apache-2.0
+oslo.log>=1.12.0 # Apache-2.0
-oslo.serialization>=1.4.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
-oslo.utils>=1.9.0 # Apache-2.0
+oslo.utils!=2.6.0,>=2.4.0 # Apache-2.0
 psutil<2.0.0,>=1.1.1
 python-glanceclient>=0.18.0
-python-keystoneclient>=1.6.0
+python-keystoneclient!=1.8.0,>=1.6.0
-python-neutronclient<3,>=2.3.11
+python-neutronclient>=2.6.0
-python-novaclient>=2.22.0
+python-novaclient!=2.33.0,>=2.29.0
-python-heatclient>=0.3.0
+python-heatclient>=0.6.0
 python-subunit>=0.0.18
 PyYAML>=3.1.0
-pyzmq>=14.3.1 # LGPL+BSD
+pyzmq<15.0.0,>=14.3.1 # LGPL+BSD
 six>=1.9.0

setup.py

@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr>=1.3'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

shaker/resources/image_builder_templates/centos.yaml

@@ -92,8 +92,7 @@ resources:
         make
         make install
         wget -O get-pip.py https://bootstrap.pypa.io/get-pip.py &&  python get-pip.py
-        pip install -U "pip<7.0"
+        pip install pbr flent pyshaker-agent
-        pip install pbr netperf-wrapper flent "pyshaker-agent<=0.0.8"
         service network restart
         cat<<'EOF' >> /etc/systemd/system/iperf.service
         [Unit]

shaker/resources/image_builder_templates/debian.yaml

@@ -69,7 +69,7 @@ resources:
         sudo apt-get update
         sudo apt-get -y install iperf netperf python-dev libzmq-dev screen
         wget -O get-pip.py https://bootstrap.pypa.io/get-pip.py && sudo python get-pip.py
-        sudo pip install netperf-wrapper flent pyshaker-agent
+        sudo pip install flent pyshaker-agent
         echo -e 'start on startup\ntask\nexec /usr/bin/screen -dmS sudo nice -n -20 /usr/bin/iperf -s' | sudo tee /etc/init/iperf-tcp.conf
         echo -e 'start on startup\ntask\nexec /usr/bin/screen -dmS sudo nice -n -20 /usr/bin/iperf -s --udp' | sudo tee /etc/init/iperf-udp.conf
         sudo shutdown now

shaker/resources/image_builder_templates/ubuntu.yaml

@@ -69,8 +69,7 @@ resources:
         sudo apt-get update
         sudo apt-get -y install iperf netperf python-dev libzmq-dev screen
         wget -O get-pip.py https://bootstrap.pypa.io/get-pip.py && sudo python get-pip.py
-        sudo pip install -U "pip<7.0"
+        sudo pip install flent pyshaker-agent
-        sudo pip install netperf-wrapper flent "pyshaker-agent<=0.0.8"
         shaker-agent -h || (echo "[critical] Failed to run pyshaker-agent. Check if it is installed in the image"; sleep 20)
         sudo apt-add-repository "deb http://ftp.debian.org/debian/ jessie main" && sudo apt-get update
         sudo apt-get -y --force-yes install iperf3