Log correct error message for wrong preview-branch value

CHANGELOG.md

@@ -7,6 +7,7 @@
 ### Changed
 
 ### Fixed
+* Log correct error message for wrong preview-branch value ([#1249](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1249))
 * Fail the pipeline when no version specified for a deploy to Q, P ([#1248](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1248))
 * Fix Tailor deployment drifts for D, Q envs ([#1055](https://github.com/opendevstack/ods-jenkins-shared-library/pull/1055))
 

src/org/ods/orchestration/util/MROPipelineUtil.groovy

@@ -344,8 +344,17 @@ class MROPipelineUtil extends PipelineUtil {
                 this.logger.info("Since in WIP and no release branch exists (${this.project.gitReleaseBranch})" +
                     "${repo.'preview-branch' ? ' and preview-branch has been configured' : ''}, " +
                     "checking out branch ${repo.'preview-branch' ? repo.'preview-branch' : repo.defaultBranch} for repo ${repo.id}")
-                scmResult.scm = checkoutBranchInRepoDir(repo, repo.'preview-branch' ? repo.'preview-branch' : repo.defaultBranch)
-                scmResult.scmBranch = repo.'preview-branch' ? repo.'preview-branch' : repo.defaultBranch
+                try {
+                    scmResult.scm = checkoutBranchInRepoDir(repo, repo.'preview-branch' ? repo.'preview-branch' : repo.defaultBranch)
+                    scmResult.scmBranch = repo.'preview-branch' ? repo.'preview-branch' : repo.defaultBranch
+                } catch (ex) {
+                    if (repo.'preview-branch') {
+                        def errorMessage = "The preview branch configured for repository " +
+                            "\"${repo.name ? repo.name : GitUtil.buildFullRepoName(project.getKey(), repo.id)} (preview-branch: ${repo.'preview-branch'})\" could not be found."
+                        throw new RuntimeException(errorMessage)
+                    }
+                    throw ex
+                }
             }
         }
         return scmResult