test-setup.sh is called after bindep is run in CI, and tox is not setup.
Simplify the script so that it only does what's needed - install
qdrouterd for Ubuntu from qpid/testing.
Install the other packages using bindep, add test to amqp1 profile.
Add amqp1 to bindep_profiles where needed for scenario tests, previously
test-setup.sh added it everywhere.
Conflicts:
.zuul.yaml
bindep.txt
Modified:
tools/test-setup.sh
NOTE(elod.illes): conflicts are due to the following patches are
missing from Stein:
* .zuul.yaml: I1874f96f78cb403e6f3a56a49cb83df40d531f8d
(dropping py35 testing)
* bindep.txt: I9fb56450346fca84bc1573fa5e9b6fe81c14e33a
(messaging intermediaries update; the lack of this patch also
requires the modification of test-setup.sh)
Change-Id: Ic3a9e2c873619670edfbf71022d593f3cb5f70f2
Related-Bug: #1885923
(cherry picked from commit 7e406c312a)
(cherry picked from commit dfcc4b0010)
(cherry picked from commit 88cf5aebef)
41 lines
1.1 KiB
Plaintext
41 lines
1.1 KiB
Plaintext
# common dpkg
|
|
gettext [platform:dpkg] # For releasenotes job
|
|
build-essential [platform:dpkg]
|
|
libffi-dev [platform:dpkg]
|
|
|
|
# common rpm
|
|
gcc [platform:rpm]
|
|
gcc-c++ [platform:rpm]
|
|
make [platform:rpm]
|
|
pkgconfig [platform:rpm]
|
|
libffi-devel [platform:rpm]
|
|
|
|
# RabbitMQ message broker
|
|
rabbitmq-server [platform:dpkg rabbit]
|
|
rabbitmq-server [platform:rpm rabbit]
|
|
|
|
# AMQP1 dpkg
|
|
# This needs qpid/testing, will be installed by tools/test-setup.sh
|
|
# qpidd [platform:dpkg amqp1 test]
|
|
sasl2-bin [platform:dpkg amqp1 test]
|
|
uuid-dev [platform:dpkg amqp1 test]
|
|
swig [platform:dpkg amqp1 test]
|
|
libsasl2-modules [platform:dpkg amqp1 test]
|
|
|
|
# AMQP1 TEST rpm
|
|
qpid-cpp-server [platform:rpm amqp1 test]
|
|
qpid-proton-c-devel [platform:rpm amqp1 test]
|
|
python-qpid-proton [platform:rpm amqp1 test]
|
|
cyrus-sasl-lib [platform:rpm amqp1 test]
|
|
cyrus-sasl-plain [platform:rpm amqp1 test]
|
|
libuuid-devel [platform:rpm amqp1 test]
|
|
swig [platform:rpm amqp1 test]
|
|
|
|
# kafka dpkg
|
|
openjdk-8-jdk [platform:dpkg kafka]
|
|
librdkafka1 [platform:dpkg kafka]
|
|
|
|
# kafka rpm
|
|
java-1.8.0-openjdk [platform:rpm kafka]
|
|
librdkafka [platform:rpm kafka]
|