diff --git a/helpers/create-abi-dump.py b/helpers/create-abi-dump.py
--- a/helpers/create-abi-dump.py
+++ b/helpers/create-abi-dump.py
@@ -369,5 +369,5 @@
 		logging.error("abi-compliance-checker exited with {retval}".format(retval=retval))
 
 # We had an issue with one of the ABIs
-if retval != 0:
-	sys.exit(retval)
+if retval != 0 and accSettings['createABIDumpFailHard']:
+	sys.exit("Errors detected and createABIDumpFailHard is set, so we fail hard.")
diff --git a/local-metadata/abi-compliance-checker.yaml b/local-metadata/abi-compliance-checker.yaml
--- a/local-metadata/abi-compliance-checker.yaml
+++ b/local-metadata/abi-compliance-checker.yaml
@@ -23,6 +23,8 @@
       - /usr/lib64/clang/7.0.0/include
     add_include_paths:
       - /usr/lib64/qt5/mkspecs/linux-g++
+    createABIDumpFailHard: False
+
 #   "SUSEQt5.10": # special settings for one platform
 #     gcc_options:
 #       - something
diff --git a/pipeline-templates/Frameworks/SUSEQt5.11.template b/pipeline-templates/Frameworks/SUSEQt5.11.template
--- a/pipeline-templates/Frameworks/SUSEQt5.11.template
+++ b/pipeline-templates/Frameworks/SUSEQt5.11.template
@@ -120,7 +120,7 @@
 			// Gather ABI Reference information for later checking
 			sh """
 				curl '$BUILD_URL/consoleText' -o currentBuildLog.txt
-				python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/' || true
+				python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/'
 			"""
 
 			// Save the ABI build logs to review if necessary
diff --git a/pipeline-templates/SUSEQt5.10.template b/pipeline-templates/SUSEQt5.10.template
--- a/pipeline-templates/SUSEQt5.10.template
+++ b/pipeline-templates/SUSEQt5.10.template
@@ -120,7 +120,7 @@
 			// Gather ABI Reference information for later checking
 			sh """
 				curl '$BUILD_URL/consoleText' -o currentBuildLog.txt
-				python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/' || true
+				python3 -u ci-tooling/helpers/create-abi-dump.py --project ${projectName} --branchGroup ${branchGroup} --platform ${currentPlatform} --buildLog currentBuildLog.txt --environment production --usingInstall '$HOME/install-prefix/'
 			"""
 			// Save the ABI build logs to review if necessary
 			archiveArtifacts artifacts: 'logs/*/*/log.txt', onlyIfSuccessful: false, allowEmptyArchive: true