Auto Update CSIT Jobs to run for nitrogen

[releng/builder.git] / jjb / integration / integration-deploy-openstack-run-test.sh

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 61870bab5999f9848f08c45e724387f7a134e79a..2521f80d951e065194eeacdd6ad4adf954e3e760 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -980,9 +980,9 @@ done
 # AccessRefused: (0, 0): (403) ACCESS_REFUSED - Login was refused using authentication mechanism AMQPLAIN. For details see the broker logfile.
 # Compare that timestamp to this log in the control stack.log: sudo rabbitmqctl set_permissions -p nova_cell1 stackrabbit
 # If the n-cpu.log is earlier than the control stack.log timestamp then the failure condition is likely hit.
-if [ ${NUM_OPENSTACK_COMPUTE_NODES} -gt 99 ]; then
+if [ ${NUM_OPENSTACK_COMPUTE_NODES} -gt 0 ]; then
     WAIT_FOR_RABBITMQ_MINUTES=60
-    echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready to allow the controller to create nova_cell1 before the computes need it"
+    echo "Wait a maximum of ${WAIT_FOR_RABBITMQ_MINUTES}m until rabbitmq is ready and nova_cell1 created to allow the controller to create nova_cell1 before the computes need it"
     set +e
     retry ${WAIT_FOR_RABBITMQ_MINUTES} 60 "is_rabbitmq_ready ${OPENSTACK_CONTROL_NODE_1_IP}"
     rc=$?