adapt Jenkinsfile to account for correct PR base branch

johanneshiry · johanneshiry · commit c3ad4360b227 · 2021-05-21T11:56:45.000+02:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -387,7 +387,7 @@ def gradle(String command, String relativeProjectDir) {
 }
 
 def determineSonarqubeGradleCmd(String sonarqubeProjectKey, String currentBranchName, String targetBranchName, String orgName, String projectName, String relativeGitDir) {
-    String prBaseBranch = targetBranchName == null "dev" : targetBranchName
+    String prBaseBranch = targetBranchName == null ? "dev" : targetBranchName
     switch (currentBranchName) {
         case "main":
             return "sonarqube -Dsonar.branch.name=main -Dsonar.projectKey=$sonarqubeProjectKey"

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ def gradle(String command, String relativeProjectDir) {`
`387`	`387`	`}`
`388`	`388`
`389`	`389`	`def determineSonarqubeGradleCmd(String sonarqubeProjectKey, String currentBranchName, String targetBranchName, String orgName, String projectName, String relativeGitDir) {`
`390`		`- String prBaseBranch = targetBranchName == null "dev" : targetBranchName`
	`390`	`+ String prBaseBranch = targetBranchName == null ? "dev" : targetBranchName`
`391`	`391`	`switch (currentBranchName) {`
`392`	`392`	`case "main":`
`393`	`393`	`return "sonarqube -Dsonar.branch.name=main -Dsonar.projectKey=$sonarqubeProjectKey"`