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
NOTE(elod.illes): conflict is due to scenario rationalizing patch
I0f86416623a0b718516147f0660b4df2b74cf867 is not present in Train.
Change-Id: Ic3a9e2c873619670edfbf71022d593f3cb5f70f2
Related-Bug: #1885923
(cherry picked from commit 7e406c312a)
(cherry picked from commit dfcc4b0010)