summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-05 15:23:15 -0400
committerTim Rozet <trozet@redhat.com>2017-09-06 08:07:20 -0400
commit0cedf1dc636d2532eb818dd88c19106199500ac7 (patch)
tree802566d9c393ec7e331a091400473e9b25c68b89 /ci
parent27018324387d4ef0efa908b315403a636f92de55 (diff)
Remove deploy.sh and references
Deploy is now pip/rpm installed as opnfv-deploy in /bin. Alternatively the deploy.py script can be invoked via python. The legacy deploy.sh was only being used for CI, which has now been updated to remove the need for the Apex repo containing ci/deploy.sh. Change-Id: I1fb93bd9de23a97a09bedb8ac014ef81955875f2 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/deploy.sh22
-rwxr-xr-xci/dev_dep_check.sh7
2 files changed, 3 insertions, 26 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
deleted file mode 100755
index 0ba0c74..0000000
--- a/ci/deploy.sh
+++ /dev/null
@@ -1,22 +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
-##############################################################################
-
-# Deploy script to install provisioning server for OPNFV 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 /home/jenkins-ci/tmp
-mv -f .build /home/jenkins-ci/tmp/
-pip3 install --upgrade --force-reinstall .
-mv -f /home/jenkins-ci/tmp/.build .
-opnfv-deploy $@
diff --git a/ci/dev_dep_check.sh b/ci/dev_dep_check.sh
index 7a14563..33f1319 100755
--- a/ci/dev_dep_check.sh
+++ b/ci/dev_dep_check.sh
@@ -32,10 +32,9 @@ if ! sudo yum update -y ipxe-roms-qemu; then
fi
# check for other packages
-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 \
+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