eliminate TEST_ONLY differentiation
devstack is a development and test environment, but by default we were only installing the runtime dependencies. We should install all the testing required packages as well. Change-Id: I7c95927b9daad15766aac9d1276b10ca62efb24c
This commit is contained in:
Sean Dague
parent
b23054c4b4
commit
eeb7bda510
@ -6,7 +6,7 @@ psmisc
|
||||
gcc
|
||||
g++
|
||||
git
|
||||
graphviz # testonly - docs
|
||||
graphviz # needed for docs
|
||||
lsof # useful when debugging
|
||||
openssh-server
|
||||
openssl
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
libmysqlclient-dev # testonly
|
||||
libpq-dev # testonly
|
||||
libssl-dev # testonly
|
||||
libmysqlclient-dev
|
||||
libpq-dev
|
||||
libssl-dev
|
||||
libxml2-dev
|
||||
libxslt1-dev # testonly
|
||||
zlib1g-dev # testonly
|
||||
libxslt1-dev
|
||||
zlib1g-dev
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
acl # testonly
|
||||
acl
|
||||
ebtables
|
||||
iptables
|
||||
iputils-ping
|
||||
iputils-arping
|
||||
libmysqlclient-dev # testonly
|
||||
libmysqlclient-dev
|
||||
mysql-server #NOPRIME
|
||||
sudo
|
||||
postgresql-server-dev-all # testonly
|
||||
postgresql-server-dev-all
|
||||
python-mysqldb
|
||||
python-mysql.connector
|
||||
python-qpid # NOPRIME
|
||||
|
||||
@ -4,7 +4,7 @@ conntrack
|
||||
kpartx
|
||||
parted
|
||||
iputils-arping
|
||||
libmysqlclient-dev # testonly
|
||||
libmysqlclient-dev
|
||||
mysql-server # NOPRIME
|
||||
python-mysqldb
|
||||
python-mysql.connector
|
||||
|
||||
@ -1 +1 @@
|
||||
libxslt1-dev # testonly
|
||||
libxslt1-dev
|
||||
|
||||
@ -6,7 +6,7 @@ euca2ools
|
||||
gcc
|
||||
gcc-c++
|
||||
git-core
|
||||
graphviz # testonly - docs
|
||||
graphviz # docs
|
||||
iputils
|
||||
libopenssl-devel # to rebuild pyOpenSSL if needed
|
||||
lsof # useful when debugging
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
acl # testonly
|
||||
acl
|
||||
dnsmasq
|
||||
dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
|
||||
ebtables
|
||||
iptables
|
||||
iputils
|
||||
mariadb # NOPRIME
|
||||
postgresql-devel # testonly
|
||||
postgresql-devel
|
||||
python-eventlet
|
||||
python-greenlet
|
||||
python-iso8601
|
||||
|
||||
@ -1 +1 @@
|
||||
libxslt1-dev # testonly
|
||||
libxslt1-dev
|
||||
|
||||
@ -5,7 +5,7 @@ euca2ools # only for testing client
|
||||
gcc
|
||||
gcc-c++
|
||||
git-core
|
||||
graphviz # testonly - docs
|
||||
graphviz # needed only for docs
|
||||
openssh-server
|
||||
openssl
|
||||
openssl-devel # to rebuild pyOpenSSL if needed
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
libxml2-devel # testonly
|
||||
libxslt-devel # testonly
|
||||
mysql-devel # testonly
|
||||
openssl-devel # testonly
|
||||
postgresql-devel # testonly
|
||||
zlib-devel # testonly
|
||||
libxml2-devel
|
||||
libxslt-devel
|
||||
mysql-devel
|
||||
openssl-devel
|
||||
postgresql-devel
|
||||
zlib-devel
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
MySQL-python
|
||||
acl # testonly
|
||||
acl
|
||||
dnsmasq # for q-dhcp
|
||||
dnsmasq-utils # for dhcp_release
|
||||
ebtables
|
||||
iptables
|
||||
iputils
|
||||
mysql-connector-python
|
||||
mysql-devel # testonly
|
||||
mysql-devel
|
||||
mysql-server # NOPRIME
|
||||
openvswitch # NOPRIME
|
||||
postgresql-devel # testonly
|
||||
postgresql-devel
|
||||
rabbitmq-server # NOPRIME
|
||||
qpid-cpp-server # NOPRIME
|
||||
sqlite
|
||||
|
||||
@ -17,7 +17,7 @@ libxml2-python
|
||||
numpy # needed by websockify for spice console
|
||||
m2crypto
|
||||
mysql-connector-python
|
||||
mysql-devel # testonly
|
||||
mysql-devel
|
||||
mysql-server # NOPRIME
|
||||
parted
|
||||
polkit
|
||||
|
||||
@ -1 +1 @@
|
||||
libxslt-devel # testonly
|
||||
libxslt-devel
|
||||
|
||||
@ -883,16 +883,6 @@ function _parse_package_files {
|
||||
fi
|
||||
fi
|
||||
|
||||
# Look for # testonly in comment
|
||||
if [[ $line =~ (.*)#.*testonly.* ]]; then
|
||||
package=${BASH_REMATCH[1]}
|
||||
# Are we installing test packages? (test for the default value)
|
||||
if [[ $INSTALL_TESTONLY_PACKAGES = "False" ]]; then
|
||||
# If not installing test packages the skip this package
|
||||
inst_pkg=0
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $inst_pkg = 1 ]]; then
|
||||
echo $package
|
||||
fi
|
||||
|
||||
23
inc/python
23
inc/python
@ -101,18 +101,17 @@ function pip_install {
|
||||
$cmd_pip install \
|
||||
$@
|
||||
|
||||
INSTALL_TESTONLY_PACKAGES=$(trueorfalse False INSTALL_TESTONLY_PACKAGES)
|
||||
if [[ "$INSTALL_TESTONLY_PACKAGES" == "True" ]]; then
|
||||
local test_req="$@/test-requirements.txt"
|
||||
if [[ -e "$test_req" ]]; then
|
||||
$sudo_pip \
|
||||
http_proxy=${http_proxy:-} \
|
||||
https_proxy=${https_proxy:-} \
|
||||
no_proxy=${no_proxy:-} \
|
||||
PIP_FIND_LINKS=$PIP_FIND_LINKS \
|
||||
$cmd_pip install \
|
||||
-r $test_req
|
||||
fi
|
||||
# Also install test requirements
|
||||
local test_req="$@/test-requirements.txt"
|
||||
if [[ -e "$test_req" ]]; then
|
||||
echo "Installing test-requirements for $test_req"
|
||||
$sudo_pip \
|
||||
http_proxy=${http_proxy:-} \
|
||||
https_proxy=${https_proxy:-} \
|
||||
no_proxy=${no_proxy:-} \
|
||||
PIP_FIND_LINKS=$PIP_FIND_LINKS \
|
||||
$cmd_pip install \
|
||||
-r $test_req
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
3
stackrc
3
stackrc
@ -615,9 +615,6 @@ USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
|
||||
# Set default screen name
|
||||
SCREEN_NAME=${SCREEN_NAME:-stack}
|
||||
|
||||
# Do not install packages tagged with 'testonly' by default
|
||||
INSTALL_TESTONLY_PACKAGES=${INSTALL_TESTONLY_PACKAGES:-False}
|
||||
|
||||
# Undo requirements changes by global requirements
|
||||
UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user