diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-11 03:32:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-11 03:32:50 +0000 |
| commit | e2aae8632a65a55f143fd39586958b21e8fd1b50 (patch) | |
| tree | d6fe9bd0f6f023324fc20350bc0b5476795a519b /tests | |
| parent | fe9092bab7ecfc58aa10ba4165c9bf21a99170e2 (diff) | |
| parent | 4d85d9d0161620c462f9541ba7005b911fbb9566 (diff) | |
| download | kolla-e2aae8632a65a55f143fd39586958b21e8fd1b50.tar.gz kolla-e2aae8632a65a55f143fd39586958b21e8fd1b50.zip | |
Merge "Use docker-engine in setup_gate"
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' |