openstack/devstack
Code Issues Proposed changes

eliminate TEST_ONLY differentiation

Browse Source 
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 2015-03-25 11:55:32 -04:00
parent b23054c4b4
commit eeb7bda510
16 changed files with 38 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/debs/general
View File

@ -6,7 +6,7 @@ psmisc
gcc gcc
g++ g++
git git
graphviz # testonly - docs graphviz # needed for docs
lsof # useful when debugging lsof # useful when debugging
openssh-server openssh-server
openssl openssl

10
files/debs/glance
View File

@ -1,6 +1,6 @@
libmysqlclient-dev # testonly libmysqlclient-dev
libpq-dev # testonly libpq-dev
libssl-dev # testonly libssl-dev
libxml2-dev libxml2-dev
libxslt1-dev # testonly libxslt1-dev
zlib1g-dev # testonly zlib1g-dev

6
files/debs/neutron
View File

@ -1,12 +1,12 @@
acl # testonly acl
ebtables ebtables
iptables iptables
iputils-ping iputils-ping
iputils-arping iputils-arping
libmysqlclient-dev # testonly libmysqlclient-dev
mysql-server #NOPRIME mysql-server #NOPRIME
sudo sudo
postgresql-server-dev-all # testonly postgresql-server-dev-all
python-mysqldb python-mysqldb
python-mysql.connector python-mysql.connector
python-qpid # NOPRIME python-qpid # NOPRIME

2
files/debs/nova
View File

@ -4,7 +4,7 @@ conntrack
kpartx kpartx
parted parted
iputils-arping iputils-arping
libmysqlclient-dev # testonly libmysqlclient-dev
mysql-server # NOPRIME mysql-server # NOPRIME
python-mysqldb python-mysqldb
python-mysql.connector python-mysql.connector

2
files/debs/trove
View File

@ -1 +1 @@
libxslt1-dev # testonly libxslt1-dev

2
files/rpms-suse/general
View File

@ -6,7 +6,7 @@ euca2ools
gcc gcc
gcc-c++ gcc-c++
git-core git-core
graphviz # testonly - docs graphviz # docs
iputils iputils
libopenssl-devel # to rebuild pyOpenSSL if needed libopenssl-devel # to rebuild pyOpenSSL if needed
lsof # useful when debugging lsof # useful when debugging

4
files/rpms-suse/neutron
View File

@ -1,11 +1,11 @@
acl # testonly acl
dnsmasq dnsmasq
dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1 dnsmasq-utils # dist:opensuse-12.3,opensuse-13.1
ebtables ebtables
iptables iptables
iputils iputils
mariadb # NOPRIME mariadb # NOPRIME
postgresql-devel # testonly postgresql-devel
python-eventlet python-eventlet
python-greenlet python-greenlet
python-iso8601 python-iso8601

2
files/rpms-suse/trove
View File

@ -1 +1 @@
libxslt1-dev # testonly libxslt1-dev

2
files/rpms/general
View File

@ -5,7 +5,7 @@ euca2ools # only for testing client
gcc gcc
gcc-c++ gcc-c++
git-core git-core
graphviz # testonly - docs graphviz # needed only for docs
openssh-server openssh-server
openssl openssl
openssl-devel # to rebuild pyOpenSSL if needed openssl-devel # to rebuild pyOpenSSL if needed

12
files/rpms/glance
View File

@ -1,6 +1,6 @@
libxml2-devel # testonly libxml2-devel
libxslt-devel # testonly libxslt-devel
mysql-devel # testonly mysql-devel
openssl-devel # testonly openssl-devel
postgresql-devel # testonly postgresql-devel
zlib-devel # testonly zlib-devel

6
files/rpms/neutron
View File

@ -1,15 +1,15 @@
MySQL-python MySQL-python
acl # testonly acl
dnsmasq # for q-dhcp dnsmasq # for q-dhcp
dnsmasq-utils # for dhcp_release dnsmasq-utils # for dhcp_release
ebtables ebtables
iptables iptables
iputils iputils
mysql-connector-python mysql-connector-python
mysql-devel # testonly mysql-devel
mysql-server # NOPRIME mysql-server # NOPRIME
openvswitch # NOPRIME openvswitch # NOPRIME
postgresql-devel # testonly postgresql-devel
rabbitmq-server # NOPRIME rabbitmq-server # NOPRIME
qpid-cpp-server # NOPRIME qpid-cpp-server # NOPRIME
sqlite sqlite

2
files/rpms/nova
View File

@ -17,7 +17,7 @@ libxml2-python
numpy # needed by websockify for spice console numpy # needed by websockify for spice console
m2crypto m2crypto
mysql-connector-python mysql-connector-python
mysql-devel # testonly mysql-devel
mysql-server # NOPRIME mysql-server # NOPRIME
parted parted
polkit polkit

2
files/rpms/trove
View File

@ -1 +1 @@
libxslt-devel # testonly libxslt-devel

10
functions-common
View File

@ -883,16 +883,6 @@ function _parse_package_files {
fi fi
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 if [[ $inst_pkg = 1 ]]; then
echo $package echo $package
fi fi

23
inc/python
View File

@ -101,18 +101,17 @@ function pip_install {
$cmd_pip install \ $cmd_pip install \
$@ $@
INSTALL_TESTONLY_PACKAGES=$(trueorfalse False INSTALL_TESTONLY_PACKAGES) # Also install test requirements
if [[ "$INSTALL_TESTONLY_PACKAGES" == "True" ]]; then local test_req="$@/test-requirements.txt"
local test_req="$@/test-requirements.txt" if [[ -e "$test_req" ]]; then
if [[ -e "$test_req" ]]; then echo "Installing test-requirements for $test_req"
$sudo_pip \ $sudo_pip \
http_proxy=${http_proxy:-} \ http_proxy=${http_proxy:-} \
https_proxy=${https_proxy:-} \ https_proxy=${https_proxy:-} \
no_proxy=${no_proxy:-} \ no_proxy=${no_proxy:-} \
PIP_FIND_LINKS=$PIP_FIND_LINKS \ PIP_FIND_LINKS=$PIP_FIND_LINKS \
$cmd_pip install \ $cmd_pip install \
-r $test_req -r $test_req
fi
fi fi
} }

3
stackrc
View File

@ -615,9 +615,6 @@ USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
# Set default screen name # Set default screen name
SCREEN_NAME=${SCREEN_NAME:-stack} 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 changes by global requirements
UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True} UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True}