From 659bcaebebc7e47d234cb0f268fd6cd90aa7ae47 Mon Sep 17 00:00:00 2001
From: Boshi LIAN <bolian@microsoft.com>
Date: Fri, 15 May 2020 01:53:17 -0700
Subject: [PATCH] introduce extra wait time for flaky mssql 2019

---
 sshpiperd/e2e/docker-compose.yml | 5 +++--
 sshpiperd/e2e/piper.sh           | 2 +-
 sshpiperd/e2e/wait.sh            | 4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sshpiperd/e2e/docker-compose.yml b/sshpiperd/e2e/docker-compose.yml
index 7f8e89e7..0a2b7388 100644
--- a/sshpiperd/e2e/docker-compose.yml
+++ b/sshpiperd/e2e/docker-compose.yml
@@ -137,6 +137,7 @@ services:
     environment:
       - "WAIT_HOST=mssql"
       - "WAIT_PORT=1433"
+      - "EXTRA_WAIT=5"
       - "SSHPIPERD_UPSTREAM_DRIVER=mssql"
       - "SSHPIPERD_UPSTREAM_MSSQL_HOST=mssql"
       - "SSHPIPERD_UPSTREAM_MSSQL_PASSWORD=yourStrong(!)Password"
@@ -160,11 +161,11 @@ services:
       - host1
       - host2
   mssql:
-    image: mcr.microsoft.com/mssql/server:2017-CU12-ubuntu
+    image: mcr.microsoft.com/mssql/server
     environment:
       - "ACCEPT_EULA=y"
       - "SA_PASSWORD=yourStrong(!)Password"
-      # - "MSSQL_PID=Developer"
+      - "MSSQL_PID=Developer"
 
     #tmpfs:
     #  - /var/opt/mssql/data
diff --git a/sshpiperd/e2e/piper.sh b/sshpiperd/e2e/piper.sh
index 726f4c44..bda437ff 100755
--- a/sshpiperd/e2e/piper.sh
+++ b/sshpiperd/e2e/piper.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 if [ ! -z $WAIT_HOST ]; then
-    /wait.sh $WAIT_HOST $WAIT_PORT
+    /wait.sh $WAIT_HOST $WAIT_PORT $EXTRA_WAIT
 fi
 
 /sshpiperd pipe add -n host1 -u host1 --upstream-username root
diff --git a/sshpiperd/e2e/wait.sh b/sshpiperd/e2e/wait.sh
index 33fb803d..422e38c2 100755
--- a/sshpiperd/e2e/wait.sh
+++ b/sshpiperd/e2e/wait.sh
@@ -7,3 +7,7 @@ for i in `seq 300`; do
     fi
     sleep 1
 done
+
+if [ -n "$3" ]; then 
+    sleep $3; 
+fi
\ No newline at end of file