summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2017-09-15 12:03:40 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-15 12:03:40 +0000
commit23acd4820209eef14ee9001646ecb81856ce18b2 (patch)
tree3a7be6e643913203af6291dc35792485bdbef3cc
parent2784827b0d2e3e2f904964c89db2421d4ababebd (diff)
parentc61e0f2ad6a1b290bb667e3bfd021ebaf12d8054 (diff)
Merge "Removes clean.sh"
-rwxr-xr-xci/clean.sh20
-rwxr-xr-xcontrib/simple_deploy.sh2
2 files changed, 1 insertions, 21 deletions
diff --git a/ci/clean.sh b/ci/clean.sh
deleted file mode 100755
index c2b987c0..00000000
--- a/ci/clean.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-##############################################################################
-# Copyright (c) 2015 Tim Rozet (Red Hat), 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
-##############################################################################
-
-#Clean script to uninstall provisioning server for Apex
-#author: Dan Radez (dradez@redhat.com)
-#author: Tim Rozet (trozet@redhat.com)
-set -e
-yum -y install python34 python34-devel libvirt-devel python34-pip python-tox ansible
-mkdir -p ~/tmp
-mv -f .build ~/tmp/
-sudo pip3 install --upgrade --force-reinstall .
-mv -f ~/tmp/.build .
-opnfv-clean $@
diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh
index d6d07f38..8da92727 100755
--- a/contrib/simple_deploy.sh
+++ b/contrib/simple_deploy.sh
@@ -3,9 +3,9 @@ set -e
apex_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../
export PYTHONPATH=$apex_home/apex:$PYTHONPATH
$apex_home/ci/dev_dep_check.sh || true
-$apex_home/ci/clean.sh
pip3 install -r $apex_home/requirements.txt
pushd $apex_home/apex
+python3 clean.py
echo "All further output will be piped to $PWD/nohup.out"
(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