diff --git a/test/openstack/install_devstack.sh b/test/openstack/install_devstack.sh
index ed3c3d47c..44772c903 100755
--- a/test/openstack/install_devstack.sh
+++ b/test/openstack/install_devstack.sh
@@ -37,11 +37,15 @@ su -c "./unstack.sh" -s /bin/bash stack
 cd /opt/stack
 rm -rf cinder devstack glance keystone heat horizon neutron nova placement requirements tacker tacker-horizon tempest
 
-if [[ $branch == "master" ]]; then
-	su -c "git clone --depth 1 https://opendev.org/openstack-dev/devstack" -s /bin/bash stack
-else
-	su -c "git clone --depth 1 https://opendev.org/openstack-dev/devstack -b stable/$branch" -s /bin/bash stack
-fi
+r=0
+until [[ $r -ge 20 ]]; do
+	if [[ $branch == "master" ]]; then
+		su -c "git clone --depth 1 https://opendev.org/openstack-dev/devstack" -s /bin/bash stack && break
+	else
+		su -c "git clone --depth 1 https://opendev.org/openstack-dev/devstack -b stable/$branch" -s /bin/bash stack && break
+	fi
+	r=$((r + 1))
+done
 cp $rootdir/scripts/vagrant/local.conf /opt/stack/devstack/local.conf
 
 cd /opt/stack/devstack