Browse code
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
Sean Dague authored on 2015/03/26 00:55:32Showing 16 changed files
- files/debs/general
- files/debs/glance
- files/debs/neutron
- files/debs/nova
- files/debs/trove
- files/rpms-suse/general
- files/rpms-suse/neutron
- files/rpms-suse/trove
- files/rpms/general
- files/rpms/glance
- files/rpms/neutron
- files/rpms/nova
- files/rpms/trove
- functions-common
- inc/python
- stackrc
| ... | ... |
@@ -1,12 +1,12 @@ |
| 1 |
-acl # testonly |
|
| 1 |
+acl |
|
| 2 | 2 |
ebtables |
| 3 | 3 |
iptables |
| 4 | 4 |
iputils-ping |
| 5 | 5 |
iputils-arping |
| 6 |
-libmysqlclient-dev # testonly |
|
| 6 |
+libmysqlclient-dev |
|
| 7 | 7 |
mysql-server #NOPRIME |
| 8 | 8 |
sudo |
| 9 |
-postgresql-server-dev-all # testonly |
|
| 9 |
+postgresql-server-dev-all |
|
| 10 | 10 |
python-mysqldb |
| 11 | 11 |
python-mysql.connector |
| 12 | 12 |
python-qpid # NOPRIME |
| ... | ... |
@@ -1,15 +1,15 @@ |
| 1 | 1 |
MySQL-python |
| 2 |
-acl # testonly |
|
| 2 |
+acl |
|
| 3 | 3 |
dnsmasq # for q-dhcp |
| 4 | 4 |
dnsmasq-utils # for dhcp_release |
| 5 | 5 |
ebtables |
| 6 | 6 |
iptables |
| 7 | 7 |
iputils |
| 8 | 8 |
mysql-connector-python |
| 9 |
-mysql-devel # testonly |
|
| 9 |
+mysql-devel |
|
| 10 | 10 |
mysql-server # NOPRIME |
| 11 | 11 |
openvswitch # NOPRIME |
| 12 |
-postgresql-devel # testonly |
|
| 12 |
+postgresql-devel |
|
| 13 | 13 |
rabbitmq-server # NOPRIME |
| 14 | 14 |
qpid-cpp-server # NOPRIME |
| 15 | 15 |
sqlite |
| ... | ... |
@@ -883,16 +883,6 @@ function _parse_package_files {
|
| 883 | 883 |
fi |
| 884 | 884 |
fi |
| 885 | 885 |
|
| 886 |
- # Look for # testonly in comment |
|
| 887 |
- if [[ $line =~ (.*)#.*testonly.* ]]; then |
|
| 888 |
- package=${BASH_REMATCH[1]}
|
|
| 889 |
- # Are we installing test packages? (test for the default value) |
|
| 890 |
- if [[ $INSTALL_TESTONLY_PACKAGES = "False" ]]; then |
|
| 891 |
- # If not installing test packages the skip this package |
|
| 892 |
- inst_pkg=0 |
|
| 893 |
- fi |
|
| 894 |
- fi |
|
| 895 |
- |
|
| 896 | 886 |
if [[ $inst_pkg = 1 ]]; then |
| 897 | 887 |
echo $package |
| 898 | 888 |
fi |
| ... | ... |
@@ -101,18 +101,17 @@ function pip_install {
|
| 101 | 101 |
$cmd_pip install \ |
| 102 | 102 |
$@ |
| 103 | 103 |
|
| 104 |
- INSTALL_TESTONLY_PACKAGES=$(trueorfalse False INSTALL_TESTONLY_PACKAGES) |
|
| 105 |
- if [[ "$INSTALL_TESTONLY_PACKAGES" == "True" ]]; then |
|
| 106 |
- local test_req="$@/test-requirements.txt" |
|
| 107 |
- if [[ -e "$test_req" ]]; then |
|
| 108 |
- $sudo_pip \ |
|
| 109 |
- http_proxy=${http_proxy:-} \
|
|
| 110 |
- https_proxy=${https_proxy:-} \
|
|
| 111 |
- no_proxy=${no_proxy:-} \
|
|
| 112 |
- PIP_FIND_LINKS=$PIP_FIND_LINKS \ |
|
| 113 |
- $cmd_pip install \ |
|
| 114 |
- -r $test_req |
|
| 115 |
- fi |
|
| 104 |
+ # Also install test requirements |
|
| 105 |
+ local test_req="$@/test-requirements.txt" |
|
| 106 |
+ if [[ -e "$test_req" ]]; then |
|
| 107 |
+ echo "Installing test-requirements for $test_req" |
|
| 108 |
+ $sudo_pip \ |
|
| 109 |
+ http_proxy=${http_proxy:-} \
|
|
| 110 |
+ https_proxy=${https_proxy:-} \
|
|
| 111 |
+ no_proxy=${no_proxy:-} \
|
|
| 112 |
+ PIP_FIND_LINKS=$PIP_FIND_LINKS \ |
|
| 113 |
+ $cmd_pip install \ |
|
| 114 |
+ -r $test_req |
|
| 116 | 115 |
fi |
| 117 | 116 |
} |
| 118 | 117 |
|
| ... | ... |
@@ -615,9 +615,6 @@ USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}
|
| 615 | 615 |
# Set default screen name |
| 616 | 616 |
SCREEN_NAME=${SCREEN_NAME:-stack}
|
| 617 | 617 |
|
| 618 |
-# Do not install packages tagged with 'testonly' by default |
|
| 619 |
-INSTALL_TESTONLY_PACKAGES=${INSTALL_TESTONLY_PACKAGES:-False}
|
|
| 620 |
- |
|
| 621 | 618 |
# Undo requirements changes by global requirements |
| 622 | 619 |
UNDO_REQUIREMENTS=${UNDO_REQUIREMENTS:-True}
|
| 623 | 620 |
|