performa/shaker
Code Issues Proposed changes

Install the agent from pypi instead of git master

Browse Source 
Change-Id: Id615458fd27c8aa4c39a95d45511426262257c8a
This commit is contained in:
Ilya Shakhat 2015-05-12 15:53:36 +03:00
parent 68a5540581
commit 8f9cf572a9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
shaker/resources/image_builder_template.yaml
View File

@ -67,10 +67,9 @@ resources:
#!/bin/bash #!/bin/bash
sudo apt-add-repository "deb http://nova.clouds.archive.ubuntu.com/ubuntu/ trusty multiverse" sudo apt-add-repository "deb http://nova.clouds.archive.ubuntu.com/ubuntu/ trusty multiverse"
sudo apt-get update sudo apt-get update
sudo apt-get -y install iperf netperf git 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 pbr netperf-wrapper sudo pip install pbr netperf-wrapper pyshaker-agent
git clone git://git.openstack.org/stackforge/shaker && cd shaker && sudo pip install -r requirements.txt && sudo python setup.py develop
sudo sed -i '1i supersede interface-mtu 1458;' /etc/dhcp/dhclient.conf sudo sed -i '1i supersede interface-mtu 1458;' /etc/dhcp/dhclient.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 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 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

3
tools/build_agent_pkg.sh
View File

@ -13,7 +13,8 @@ export PBR_VERSION="$(git describe --exact-match)"
cd ${TEMP_DIR} cd ${TEMP_DIR}
echo "Building pyshaker-agent version ${PBR_VERSION}" echo "Building pyshaker-agent version ${PBR_VERSION}"
python setup.py sdist upload python setup.py sdist
twine upload -s dist/*
cd - cd -
rm -rf ${TEMP_DIR} rm -rf ${TEMP_DIR}