diff options
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/dev_dep_check.sh | 55 | ||||
| -rwxr-xr-x | contrib/simple_deploy.sh | 15 |
2 files changed, 59 insertions, 11 deletions
diff --git a/contrib/dev_dep_check.sh b/contrib/dev_dep_check.sh new file mode 100755 index 00000000..33f1319f --- /dev/null +++ b/contrib/dev_dep_check.sh @@ -0,0 +1,55 @@ +#!/bin/sh +############################################################################## +# Copyright (c) 2016 Dan Radez (Red Hat) and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# This script makes sure deploy deps are installed when not relying on RPM + +set -e + +rdo_action="update" + +# check for rdo-release +if ! rpm -q rdo-release > /dev/null; then + rdo_action="install" +fi + +# make sure rdo release +if ! sudo yum $rdo_action -y https://www.rdoproject.org/repos/rdo-release.rpm; then + echo "Failed to $rdo_action RDO Release package..." + exit 1 +fi + +# update ipxe-roms-qemu +if ! sudo yum update -y ipxe-roms-qemu; then + echo "Failed to update ipxe-roms-qemu package..." + exit 1 +fi + +# check for other packages +for i in epel-release openvswitch libguestfs \ + libguestfs-tools-c libvirt-python libxslt-devel \ + libxml2-devel ansible 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 + echo "Failed to install $i package..." + exit 1 + fi + fi +done + +# install pip dependencies +sudo pip3 install python-ipmi gitpython pygerrit2 + +# Required packages to redirect stdin with virt-customize +if ! sudo yum -y install libguestfs libguestfs-tools libguestfs-tools-c supermin supermin5 supermin-helper perl-Sys-Guestfs python-libguestfs; then + echo "Failed to install supermin/libguestfs packages..." + exit 1 +fi diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh index 24b67904..d6d07f38 100755 --- a/contrib/simple_deploy.sh +++ b/contrib/simple_deploy.sh @@ -1,20 +1,13 @@ #!/bin/bash set -e apex_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../ -export BASE=$apex_home/build -export LIB=$apex_home/lib -export IMAGES=$apex_home/.build/ -export PYTHONPATH=$PYTHONPATH:$apex_home/lib/python +export PYTHONPATH=$apex_home/apex:$PYTHONPATH $apex_home/ci/dev_dep_check.sh || true $apex_home/ci/clean.sh -pushd $apex_home/build -make clean -make undercloud -make overcloud-opendaylight -popd -pushd $apex_home/ci +pip3 install -r $apex_home/requirements.txt +pushd $apex_home/apex 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 &) +(nohup python3 deploy.py -v -n ../config/network/network_settings.yaml -d ../config/deploy/os-nosdn-nofeature-noha.yaml --deploy-dir ../build --lib-dir ../lib --image-dir ../.build &) [ -f nohup.out ] || sleep 3 tail -f nohup.out popd |