[ FAB-5521 ] Fix CI build fail x86 for slapd

The builds on x86 are now so slow that some of the setup scripts are failing because slapd is taking so long to initialize This adds polling to the slapd_setup script so that the first command is not issued until there is an active listener. Also, the ldap configuration should be done exclusively using ldapmodify. This will move the olcIdleTimeout config from start.sh to the slapd_setup.sh script. Change-Id: I0c38df7b939734e112f0fa8a7728211143a043e2 Signed-off-by: rennman <[email protected]>
hyperledger · Aug 25, 2017 · 3c819af · 3c819af
1 parent 3d521fc
commit 3c819af
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 36 deletions.
diff --git a/images/fabric-ca-fvt/payload/forceTimeout.ldif b/images/fabric-ca-fvt/payload/forceTimeout.ldif
@@ -0,0 +1,3 @@
+dn: cn=config
+add: olcIdleTimeout
+olcIdleTimeout: 1
diff --git a/images/fabric-ca-fvt/payload/slapd_setup.sh b/images/fabric-ca-fvt/payload/slapd_setup.sh
@@ -38,6 +38,7 @@ done
 ldapadd -h localhost -p $LDAPPORT -D cn=$LDAPUSER,dc=example,dc=com -w $LDAPPASWD -f /etc/ldap/base.ldif || let RC+=1
 ldapadd -h localhost -p $LDAPPORT -D cn=$LDAPUSER,dc=example,dc=com -w $LDAPPASWD -f /etc/ldap/add-users.ldif || let RC+=1
 ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/ldap/certinfo.ldif || let RC+=1
+ldapmodify -Y EXTERNAL -H ldapi:/// -f /etc/ldap/forceTimeout.ldif
 /etc/init.d/slapd stop
 
 exit $RC
diff --git a/images/fabric-ca-fvt/start.sh b/images/fabric-ca-fvt/start.sh