diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-14 01:42:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-14 01:42:09 +0000 |
| commit | 39a19ef862b49088e50efd982a76ee7d8c039941 (patch) | |
| tree | 62937ae0f0a2f0e8e9569d187bea90d000db5b41 | |
| parent | 5fe0e6768564b1ac132f4e77a8e22a76a08e60d9 (diff) | |
| parent | 2df40e2946adbb241d3af89dcfbba6b041c3e415 (diff) | |
| download | kolla-39a19ef862b49088e50efd982a76ee7d8c039941.tar.gz kolla-39a19ef862b49088e50efd982a76ee7d8c039941.zip | |
Merge "Pin docker to 1.8.2 in gate"
| -rwxr-xr-x | tests/setup_centos.sh | 2 | ||||
| -rwxr-xr-x | tests/setup_fedora.sh | 2 | ||||
| -rwxr-xr-x | tests/setup_ubuntu.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/setup_centos.sh b/tests/setup_centos.sh index fdd3b31e2..0f5c1c6a1 100755 --- a/tests/setup_centos.sh +++ b/tests/setup_centos.sh @@ -12,7 +12,7 @@ gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg EOF -sudo yum install -y libffi-devel openssl-devel docker-engine xfsprogs +sudo yum install -y libffi-devel openssl-devel docker-engine-1.8.2 xfsprogs # Setup backing disk for use with Docker. This is to ensure we use the ephemeral # disk provided to the build instance. It ensures the correct disk and storage diff --git a/tests/setup_fedora.sh b/tests/setup_fedora.sh index 4a1be53d8..7cb86e2d2 100755 --- a/tests/setup_fedora.sh +++ b/tests/setup_fedora.sh @@ -12,7 +12,7 @@ gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg EOF -sudo yum install -y libffi-devel openssl-devel docker-engine xfsprogs +sudo yum install -y libffi-devel openssl-devel docker-engine-1.8.2 xfsprogs # Setup backing disk for use with Docker. This is to ensure we use the ephemeral # disk provided to the build instance. It ensures the correct disk and storage diff --git a/tests/setup_ubuntu.sh b/tests/setup_ubuntu.sh index 407c5c541..4eb30bc8b 100755 --- a/tests/setup_ubuntu.sh +++ b/tests/setup_ubuntu.sh @@ -9,7 +9,7 @@ sudo mount echo 'deb http://apt.dockerproject.org/repo ubuntu-trusty main' | sudo tee /etc/apt/sources.list.d/docker.list sudo apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D sudo apt-get update -sudo apt-get install -y --no-install-recommends docker-engine btrfs-tools +sudo apt-get install -y --no-install-recommends docker-engine=1.8.2-0~trusty btrfs-tools # The reason for using BTRFS is stability. There are numerous issues with the # devicemapper backed on Ubuntu and AUFS is slow. BTRFS is very solid as a |