performa/shaker
Code Issues Proposed changes

Pin version of shaker agent and pip

Browse Source 
Change-Id: I120cd92b39c88476cc9e64cc4921e58776ab0adb
This commit is contained in:
Ilya Shakhat 2015-08-07 18:18:53 +03:00
parent 7bd0b34de8
commit f62ff7794a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shaker/resources/image_builder_templates/centos.yaml
View File

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

5
shaker/resources/image_builder_templates/ubuntu.yaml
View File

@ -69,8 +69,9 @@ resources:
sudo apt-get update sudo apt-get update
sudo apt-get -y install iperf netperf python-dev libzmq-dev screen 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 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 -U "pip<7.0"
shaker-agent -h || (echo "[critical] Failed to run pyshaker-agent. Check if it installed into the image"; sleep 20) 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-add-repository "deb http://ftp.debian.org/debian/ jessie main" && sudo apt-get update
sudo apt-get -y --force-yes install iperf3 sudo apt-get -y --force-yes install iperf3
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' | sudo tee /etc/init/iperf-tcp.conf