openstack/kolla
Code Issues Proposed changes

Merge "Use docker-engine in setup_gate"

Browse Source
This commit is contained in:
Jenkins 2015-08-11 03:32:50 +00:00 committed by Gerrit Code Review
commit e2aae8632a
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/setup_gate.sh
View File

@ -2,14 +2,13 @@
set -e
sudo yum install -y libffi-devel openssl-devel docker
sudo /usr/sbin/usermod -a -G dockerroot ${SUDO_USER:-$USER}
sudo yum install -y libffi-devel openssl-devel
sudo yum install -y http://yum.dockerproject.org/repo/main/fedora/21/Packages/docker-engine-1.7.1-1.fc21.x86_64.rpm
sudo systemctl start docker
sleep 1
group_str="jenkins ALL=(:dockerroot) NOPASSWD: ALL"
group_str="jenkins ALL=(:docker) NOPASSWD: ALL"
sudo grep -x "$group_str" /etc/sudoers > /dev/null || sudo bash -c "echo \"$group_str\" >> /etc/sudoers"
sudo chown root:dockerroot /var/run/docker.sock
# disable ipv6 until we're sure routes to fedora mirrors work properly
sudo sh -c 'echo "net.ipv6.conf.all.disable_ipv6 = 1" >> /etc/sysctl.conf'

5
tox.ini
View File

@ -35,9 +35,12 @@ whitelist_externals = find
bash
sudo
commands =
bash -c "if [ -f .buildconf ]; then mv .buildconf buildconf.bak; fi"
bash -c "echo PREFIX=centos-rdo- > .buildconf"
find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi"
sudo -g dockerroot testr run ^(test_images).*
sudo -g docker testr run ^(test_images).*
bash -c "if [ -f buildconf.bak ]; then mv buildconf.bak .buildconf; fi"
[testenv:startenv]
whitelist_externals = bash