diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-10 05:15:58 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-10 12:36:09 -0700 |
| commit | 4d85d9d0161620c462f9541ba7005b911fbb9566 (patch) | |
| tree | 923a2077134e3488af899b23804fb99a5a0ac42b /tests | |
| parent | 88b6f97cd05dceb817978f6bb44d528cd39d31a9 (diff) | |
| download | kolla-4d85d9d0161620c462f9541ba7005b911fbb9566.tar.gz kolla-4d85d9d0161620c462f9541ba7005b911fbb9566.zip | |
Use docker-engine in setup_gate
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
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/setup_gate.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/setup_gate.sh b/tests/setup_gate.sh index 9bb7b5f95..c42095aef 100755 --- a/tests/setup_gate.sh +++ b/tests/setup_gate.sh @@ -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' |