openstack/kolla
Code Issues Proposed changes

Use docker-engine in setup_gate

Browse Source 
The fedora version of docker is hacked by Red Hat to have specific
features which we don't want in the gating.  Use the pristine
upstream version from Docker Inc.

Change-Id: Ied219bc3868176f541083e9d42cde7d6cdeeb71d
Partially-Implements: blueprint gate-source-builds
This commit is contained in:
Steven Dake 2015-08-10 05:15:58 -07:00
parent 88b6f97cd0
commit 4d85d9d016
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 set -e
sudo yum install -y libffi-devel openssl-devel docker sudo yum install -y libffi-devel openssl-devel
sudo /usr/sbin/usermod -a -G dockerroot ${SUDO_USER:-$USER} 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 sudo systemctl start docker
sleep 1 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 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 # 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' 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 bash
sudo sudo
commands = 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 find . -type f -name "*.pyc" -delete
bash -c "if [ ! -d .testrepository ]; then testr init; fi" 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] [testenv:startenv]
whitelist_externals = bash whitelist_externals = bash