From 8f9cf572a911f2f9f0e3814cfc8a2e15633cc508 Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <ishakhat@mirantis.com>
Date: Tue, 12 May 2015 15:53:36 +0300
Subject: [PATCH] Install the agent from pypi instead of git master
Change-Id: Id615458fd27c8aa4c39a95d45511426262257c8a
---
shaker/resources/image_builder_template.yaml | 5 ++---
tools/build_agent_pkg.sh | 3 ++-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/shaker/resources/image_builder_template.yaml b/shaker/resources/image_builder_template.yaml
index 716c102..d0d8dd6 100644
--- a/shaker/resources/image_builder_template.yaml
+++ b/shaker/resources/image_builder_template.yaml
@@ -67,10 +67,9 @@ resources:
#!/bin/bash
sudo apt-add-repository "deb http://nova.clouds.archive.ubuntu.com/ubuntu/ trusty multiverse"
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
- sudo pip install pbr netperf-wrapper
- git clone git://git.openstack.org/stackforge/shaker && cd shaker && sudo pip install -r requirements.txt && sudo python setup.py develop
+ sudo pip install pbr netperf-wrapper pyshaker-agent
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 --udp' | sudo tee /etc/init/iperf-udp.conf
diff --git a/tools/build_agent_pkg.sh b/tools/build_agent_pkg.sh
index 13f847b..c4e6c7d 100755
--- a/tools/build_agent_pkg.sh
+++ b/tools/build_agent_pkg.sh
@@ -13,7 +13,8 @@ export PBR_VERSION="$(git describe --exact-match)"
cd ${TEMP_DIR}
echo "Building pyshaker-agent version ${PBR_VERSION}"
-python setup.py sdist upload
+python setup.py sdist
+twine upload -s dist/*
cd -
rm -rf ${TEMP_DIR}