summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/dev_dep_check.sh3
-rwxr-xr-x[-rw-r--r--]contrib/simple_deploy.sh1
2 files changed, 3 insertions, 1 deletions
diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index fe4976a..7a14563 100755
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -35,7 +35,8 @@ fi
for i in epel-release python34-PyYAML openvswitch libguestfs \
libguestfs-tools-c libvirt-python python2-oslo-config \
python2-debtcollector python34-devel libxslt-devel \
- libxml2-devel python-virtualbmc python34-jinja2 python34-pip; do
+ libxml2-devel python-virtualbmc python34-jinja2 python34-pip \
+ rpm-build wget libvirt ntpdate; do
# Make sure deploy deps are installed
if ! rpm -q $i > /dev/null; then
if ! sudo yum install -y $i; then
diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh
index 0b9b6ca..24b6790 100644..100755
--- a/contrib/simple_deploy.sh
+++ b/contrib/simple_deploy.sh
@@ -15,5 +15,6 @@ popd
pushd $apex_home/ci
echo "All further output will be piped to $PWD/nohup.out"
(nohup ./deploy.sh -v -n $apex_home/config/network/network_settings.yaml -d $apex_home/config/deploy/os-odl-nofeature-noha.yaml &)
+[ -f nohup.out ] || sleep 3
tail -f nohup.out
popd