c5d17905de
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)
21 lines
754 B
Bash
Executable File
21 lines
754 B
Bash
Executable File
#!/bin/bash -xe
|
|
|
|
# This script will be run by OpenStack CI before unit tests are run,
|
|
# it sets up the test system as needed.
|
|
# Developer should setup their test systems in a similar way.
|
|
|
|
# This setup for amqp1 needs to be run by a user that can run sudo.
|
|
|
|
# qpidd needs to be installed from qpid/testing repo in Ubuntu.
|
|
# bindep does not allow setting up another repo, so we just install
|
|
# this package here.
|
|
|
|
# inspired from project-config install-distro-packages.sh
|
|
if apt-get -v >/dev/null 2>&1 ; then
|
|
sudo add-apt-repository -y ppa:qpid/testing
|
|
sudo apt-get -qq update
|
|
sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \
|
|
apt-get -q --option "Dpkg::Options::=--force-confold" \
|
|
--assume-yes install qpidd
|
|
fi
|