summaryrefslogtreecommitdiff
path: root/bindep.txt
diff options
context:
space:
mode:
authorLee Yarwood <lyarwood@redhat.com>2021-06-15 12:48:13 +0100
committerLee Yarwood <lyarwood@redhat.com>2021-06-18 12:34:27 +0100
commit085de864db31631ead22f9c23488ed05b6bd5f88 (patch)
tree1cad2ca50161a641c01df3b3262f7726fba2ad73 /bindep.txt
parenta0ec2de968cfded8b88c2f3af1152b5932d675b7 (diff)
downloadnova-085de864db31631ead22f9c23488ed05b6bd5f88.tar.gz
tests: Allow bindep and test-setup.sh to run on EL distros
Only install mariadb on EL based hosts. Also when using mariadb and postgresql on EL based distros we need to ensure each service is configured and actually started before using either. Co-Authored-By: Ade Lee <alee@redhat.com> Change-Id: I7122933d85bd7d0333c2c35e0f1a8414c1baa6d5
Diffstat (limited to 'bindep.txt')
-rw-r--r--bindep.txt8
1 files changed, 5 insertions, 3 deletions
diff --git a/bindep.txt b/bindep.txt
index b32c5cba73..3a4d7bef80 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -24,10 +24,12 @@ libxml2-dev [platform:dpkg test]
libxslt-devel [platform:rpm test]
libxslt1-dev [platform:dpkg test]
locales [platform:debian]
-mysql [platform:rpm]
+mysql [platform:rpm !platform:redhat]
mysql-client [platform:dpkg]
-mysql-devel [platform:rpm test]
-mysql-server
+mysql-devel [platform:rpm !platform:redhat test]
+mysql-server [!platform:redhat]
+mariadb-devel [platform:rpm platform:redhat test]
+mariadb-server [platform:rpm platform:redhat]
openssh-client [platform:dpkg]
openssh-clients [platform:rpm]
openssl