From 0fade3080935ecd91cf98150c9299112e6d0690d Mon Sep 17 00:00:00 2001 From: Sam Hague Date: Tue, 5 Jun 2018 10:04:10 -0400 Subject: [PATCH] rm wait_for_compute workaround https://review.openstack.org/547673 has been merged so the workaround is no longer required. Change-Id: Iaaec363978f9b54f74290d6276b89a7786d7ad48 Signed-off-by: Sam Hague --- jjb/integration/integration-deploy-openstack-run-test.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index f4b4236a3..4910dbf2e 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -988,10 +988,6 @@ if [ -n "${DEVSTACK_HASH}" ]; then fi git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s%b' -n20 echo -echo "workaround: adjust wait from 60s to 1800s (30m)" -sed -i 's/wait_for_compute 60/wait_for_compute 1800/g' /opt/stack/devstack/lib/nova -# TODO: modify sleep 1 to sleep 60, search wait_for_compute, then first sleep 1 -# that would just reduce the number of logs in the compute stack.log echo "workaround: do not upgrade openvswitch" sudo yum install -y yum-plugin-versionlock -- 2.36.6