Make sure we do not exit on error, instead just log it.

AdoptOpenJDK · Mar 17, 2020 · 8e17b7d · 8e17b7d
1 parent e58b77e
commit 8e17b7d
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/build_all.sh b/build_all.sh
@@ -39,10 +39,11 @@ do
 
 			err=$?
 			if [ ${err} != 0 ] ||  [ ! -f ./push_commands.sh ]; then
+				echo "#############################################"
 				echo
 				echo "ERROR: Docker Build for version ${ver} failed."
 				echo
-				exit 1;
+				echo "#############################################"
 			fi
 			echo
 			echo "WARNING: Pushing to AdoptOpenJDK repo on hub.docker.com"

diff --git a/build_latest.sh b/build_latest.sh
@@ -57,8 +57,11 @@ function build_image() {
 	echo "#####################################################"
 	# shellcheck disable=SC2086 # ignoring ${tags} due to whitespace problem
 	if ! docker build --pull --no-cache ${tags} -f "${dockerfile}" . ; then
+		echo "#############################################"
+		echo
 		echo "ERROR: Docker build of image: ${tags} from ${dockerfile} failed."
-		exit 1
+		echo
+		echo "#############################################"
 	fi
 }
 

diff --git a/test_all.sh b/test_all.sh
@@ -41,10 +41,11 @@ do
 
 			err=$?
 			if [ ${err} != 0 ]; then
+				echo "#############################################"
 				echo
 				echo "ERROR: Docker test for version ${ver} failed."
 				echo
-				exit 1;
+				echo "#############################################"
 			fi
 		done
 	done

diff --git a/test_multiarch.sh b/test_multiarch.sh
@@ -45,8 +45,9 @@ function test_java_version() {
 	echo "TEST: Running java -version test on image: ${img}..."
 	# Don't use "-it" flags as the jenkins job doesn't have a tty
 	if ! docker run --rm "${img}" java -version; then
-		printf "ERROR: Docker Image %s failed the java -version test\n" "${img}"
-		exit 1
+		printf "\n##############################################\n"
+		printf "\nERROR: Docker Image %s failed the java -version test\n" "${img}"
+		printf "\n##############################################\n"
 	fi
 	echo
 }
@@ -71,8 +72,9 @@ function test_aliases() {
 		echo -n "INFO: Pulling image: ${target_repo}:${arch_tag}..."
 		ret=$(check_image "${target_repo}":"${arch_tag}")
 		if [ "${ret}" != 0 ]; then
-			printf "Error: Docker Image %s not found on hub.docker\n" "${img}"
-			exit 1
+			printf "\n##############################################\n"
+			printf "\nError: Docker Image %s not found on hub.docker\n" "${img}"
+			printf "\n##############################################\n"
 		fi
 	done
 
@@ -82,8 +84,9 @@ function test_aliases() {
 		echo -n "INFO: Pulling image: ${target_repo}:${tag_alias}..."
 		ret=$(check_image "${target_repo}":"${tag_alias}")
 		if [ "${ret}" != 0 ]; then
-			printf "Error: Docker Image %s not found on hub.docker\n" "${img}"
-			exit 1
+			printf "\n##############################################\n"
+			printf "\nError: Docker Image %s not found on hub.docker\n" "${img}"
+			printf "\n##############################################\n"
 		fi
 		run_tests "${target_repo}":"${tag_alias}"
 	done
@@ -105,8 +108,9 @@ function test_tags() {
 		echo -n "INFO: Pulling image: ${target_repo}:${arch_tag}..."
 		ret=$(check_image "${target_repo}":"${arch_tag}")
 		if [ "${ret}" != 0 ]; then
-			printf "Error: Docker Image %s not found on hub.docker\n" "${img}"
-			exit 1
+			printf "\n##############################################\n"
+			printf "\nError: Docker Image %s not found on hub.docker\n" "${img}"
+			printf "\n##############################################\n"
 		fi
 		run_tests "${target_repo}":"${arch_tag}"
 	done

diff --git a/update_manifest_all.sh b/update_manifest_all.sh
@@ -38,10 +38,11 @@ do
 
 			err=$?
 			if [ ${err} != 0 ] || [ ! -f ./manifest_commands.sh ]; then
+				echo "#############################################"
 				echo
 				echo "ERROR: Docker Build for version ${ver} failed."
 				echo
-				exit 1;
+				echo "#############################################"
 			fi
 			echo
 			echo "WARNING: Pushing to AdoptOpenJDK repo on hub.docker.com"