Re-work ldap setup script

To check server is listening before attempting to add data

diff --git a/scripts/ci/ldap-setup.sh b/scripts/ci/ldap-setup.sh
index ec3ba2c943f95656580bfe6dac067afb87c09c7c..c549f1305319914c3a79932444298d64120066de 100755 (executable)
--- a/scripts/ci/ldap-setup.sh
+++ b/scripts/ci/ldap-setup.sh
@@ -34,10 +34,9 @@ slapd -h "ldap://127.0.0.1:3890/" -f scripts/ci/ldap/slapd.conf &
 # Wait for LDAP to start
 sleep 1
 
-# Add test data
 count=0
 while [ $count -lt 10 ] ; do
-    if ldapadd -x -H ldap://127.0.0.1:3890/ -D "cn=admin,cn=config" -w secret -f src/tests/salt-test-server/salt/ldap/base.ldif ; then
+    if [ `ss -ltnp | grep 3890 | wc -l` -ge 1 ] ; then
         break 2
     else
         count=$((count+1))
@@ -45,6 +44,9 @@ while [ $count -lt 10 ] ; do
     fi
 done
 
+# Add test data
+ldapadd -x -H ldap://127.0.0.1:3890/ -D "cn=admin,cn=config" -w secret -f src/tests/salt-test-server/salt/ldap/base.ldif
+
 if [ $? -ne 0 ]; then
        echo "Error configuring server"
        exit 1