fixing error

robertpatrick · robertpatrick · commit 2246f1b8250d · 2022-05-11T17:10:36.000-05:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -33,6 +33,7 @@ pipeline {
 
         sonar_org = 'oracle'
         sonar_project_key = "${sonar_org}_weblogic-toolkit-ui"
+        sonar_branch = sh(returnStdout: true, script: "echo ${env.GIT_BRANCH} | awk -F/ '{ print $2 }'").trim()
     }
     stages {
         stage('Compute file version number') {
@@ -149,7 +150,6 @@ pipeline {
                                 jdk "JDK 11.0.9"
                             }
                             environment {
-                                sonar_branch = sh(returnStdout: true, script: "echo ${GIT_BRANCH} | awk -F/ '{ print $2 }'").trim()
                                 sonarscanner_config_file = "${sonarscanner_install_dir}/conf/sonar-scanner.properties"
                                 electron_coverage = "${WORKSPACE}/electron/coverage/lcov.info"
                                 webui_coverage = "${WORKSPACE}/webui/coverage/lcov.info"

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ pipeline {`
`33`	`33`
`34`	`34`	`sonar_org = 'oracle'`
`35`	`35`	`sonar_project_key = "${sonar_org}_weblogic-toolkit-ui"`
	`36`	`+ sonar_branch = sh(returnStdout: true, script: "echo ${env.GIT_BRANCH} \| awk -F/ '{ print $2 }'").trim()`
`36`	`37`	`}`
`37`	`38`	`stages {`
`38`	`39`	`stage('Compute file version number') {`
`@@ -149,7 +150,6 @@ pipeline {`
`149`	`150`	`jdk "JDK 11.0.9"`
`150`	`151`	`}`
`151`	`152`	`environment {`
`152`		`- sonar_branch = sh(returnStdout: true, script: "echo ${GIT_BRANCH} \| awk -F/ '{ print $2 }'").trim()`
`153`	`153`	`sonarscanner_config_file = "${sonarscanner_install_dir}/conf/sonar-scanner.properties"`
`154`	`154`	`electron_coverage = "${WORKSPACE}/electron/coverage/lcov.info"`
`155`	`155`	`webui_coverage = "${WORKSPACE}/webui/coverage/lcov.info"`