Remove leftover references to files/pips/
The files/pips/* files were removed a while ago (replaced by pip-requires in individual projects). So remove leftover code that was dealing with that. Change-Id: Id521a3365ab018193607389f022a25acddb49714
This commit is contained in:
parent
a823ab4647
commit
7c3053da69
4
stack.sh
4
stack.sh
@ -779,10 +779,6 @@ if [[ $TRACK_DEPENDS = True ]] ; then
|
||||
$DEST/.venv/bin/pip freeze > $DEST/requires-pre-pip
|
||||
fi
|
||||
|
||||
# Install python requirements
|
||||
echo_summary "Installing Python prerequisites"
|
||||
pip_install $(get_packages $FILES/pips | sort -u)
|
||||
|
||||
|
||||
# Check Out Source
|
||||
# ----------------
|
||||
|
@ -108,7 +108,7 @@ function map_nbd {
|
||||
echo $NBD
|
||||
}
|
||||
|
||||
# Prime image with as many apt/pips as we can
|
||||
# Prime image with as many apt as we can
|
||||
DEV_FILE=$CACHEDIR/$DIST_NAME-dev.img
|
||||
DEV_FILE_TMP=`mktemp $DEV_FILE.XXXXXX`
|
||||
if [ ! -r $DEV_FILE ]; then
|
||||
@ -121,7 +121,6 @@ if [ ! -r $DEV_FILE ]; then
|
||||
|
||||
chroot $MNTDIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`
|
||||
chroot $MNTDIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1`
|
||||
chroot $MNTDIR pip install `cat files/pips/*`
|
||||
|
||||
# Create a stack user that is a member of the libvirtd group so that stack
|
||||
# is able to interact with libvirt.
|
||||
|
@ -48,8 +48,6 @@ DEST=${DEST:-/opt/stack}
|
||||
TEMPEST_DIR=$DEST/tempest
|
||||
|
||||
# Install tests and prerequisites
|
||||
pip_install `cat $TOP_DIR/files/pips/tempest`
|
||||
|
||||
git_clone $TEMPEST_REPO $TEMPEST_DIR $TEMPEST_BRANCH
|
||||
|
||||
trap - SIGHUP SIGINT SIGTERM SIGQUIT EXIT
|
||||
|
@ -68,7 +68,7 @@ fi
|
||||
# Option to warm the base image with software requirements.
|
||||
if [ $WARM_CACHE ]; then
|
||||
cd $TOOLS_DIR
|
||||
./warm_apts_and_pips_for_uec.sh $image_dir/disk
|
||||
./warm_apts_for_uec.sh $image_dir/disk
|
||||
fi
|
||||
|
||||
# Name of our instance, used by libvirt
|
||||
|
@ -98,7 +98,7 @@ GUEST_NAME=${GUEST_NAME:-devstack}
|
||||
# Pre-load the image with basic environment
|
||||
if [ ! -e $image_dir/disk-primed ]; then
|
||||
cp $image_dir/disk $image_dir/disk-primed
|
||||
$TOOLS_DIR/warm_apts_and_pips_for_uec.sh $image_dir/disk-primed
|
||||
$TOOLS_DIR/warm_apts_for_uec.sh $image_dir/disk-primed
|
||||
$TOOLS_DIR/copy_dev_environment_to_uec.sh $image_dir/disk-primed
|
||||
fi
|
||||
|
||||
|
@ -1,6 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# **warm_apts_and_pips_for_uec.sh**
|
||||
# **warm_apts_for_uec.sh**
|
||||
|
||||
# Echo commands
|
||||
set -o xtrace
|
||||
@ -48,8 +48,6 @@ cp /etc/resolv.conf $STAGING_DIR/etc/resolv.conf
|
||||
chroot $STAGING_DIR apt-get update
|
||||
chroot $STAGING_DIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`
|
||||
chroot $STAGING_DIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1` || true
|
||||
mkdir -p $STAGING_DIR/var/cache/pip
|
||||
PIP_DOWNLOAD_CACHE=/var/cache/pip chroot $STAGING_DIR pip install `cat files/pips/*` || true
|
||||
|
||||
# Unmount
|
||||
umount $STAGING_DIR
|
Loading…
Reference in New Issue
Block a user