From 5a08eb420c14d377fcb8e67e9c5249e025f5bbe0 Mon Sep 17 00:00:00 2001
From: Le Zhang <zhangl@us.ibm.com>
Date: Thu, 3 Aug 2023 12:54:16 -0400
Subject: [PATCH] fix e2edev since docker build message is changed with docker
 buildkit

Signed-off-by: Le Zhang <zhangl@us.ibm.com>
---
 test/gov/hzn_dev_services.sh | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/test/gov/hzn_dev_services.sh b/test/gov/hzn_dev_services.sh
index 0291c4279..94b5795ec 100755
--- a/test/gov/hzn_dev_services.sh
+++ b/test/gov/hzn_dev_services.sh
@@ -4,14 +4,21 @@
 
 # Verify a response. The inputs are:
 # $1 - the response
-# $2 - expected result
-# $3 - error message
+# $2 - expected result with docker legacy build
+# $3 - expected result with DOCKER_BUILDKIT
+# $4 - error message
 function verify {
-    respContains=$(echo $1 | grep "$2")
+    local resp=$1
+    respContains=$(echo $resp | grep "$2")
     if [ "${respContains}" == "" ]; then
-        echo -e "\nERROR: $3. Output was:"
-        echo -e "$1"
-        exit 1
+        echo -e "Didn't find \"$2\" in the response, check \"$3\" in response"
+        # with DOCKER_BUILDKIT, message is: # writing image sha256:[0-9A-Za-z]* done
+        respContains=$(echo $resp | grep -E "$3")
+        if [ "${respContains}" == "" ]; then
+            echo -e "\nERROR: $4. Output was:"
+            echo -e "$resp"
+            exit 1
+        fi
     fi
 }
 
@@ -33,7 +40,7 @@ function createProject {
 
     buildOut=$(make ARCH="${ARCH}" 2>&1)
 
-    verify "${buildOut}" "Successfully built" "$2 container did not build"
+    verify "${buildOut}" "Successfully built" "writing image sha256:[0-9A-Za-z]* done" "$2 container did not build"
     if [ $? -ne 0 ]; then exit $?; fi
 
     verify "${buildOut}" "$3" "$2 container did not produce output"