Hotfix related to #2379. The sonar.newCode.referenceBranch and sonar.…

…branch.name cannot be set to the same string! Only add the newCode definition when they differ.
dtcenter · Apr 2, 2024 · a72e8c5 · a72e8c5
1 parent 2c72a1b
commit a72e8c5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/internal/scripts/docker/build_met_sonarqube.sh b/internal/scripts/docker/build_met_sonarqube.sh
@@ -95,6 +95,11 @@ sed -e "s|SONAR_TOKEN|$SONAR_TOKEN|" \
     -e "s|SONAR_REFERENCE_BRANCH|$SONAR_REFERENCE_BRANCH|" \
     $SONAR_PROPERTIES_DIR/python.sonar-project.properties > $SONAR_PROPERTIES
 
+# The source and reference branches must differ to define new code
+if [ "$MET_GIT_NAME" != "$SONAR_REFERENCE_BRANCH" ]; then
+  echo "sonar.newCode.referenceBranch=${SONAR_REFERENCE_BRANCH}" >> $SONAR_PROPERTIES
+fi
+
 # Run SonarQube scan for Python code
 time_command $SONAR_SCANNER
 
@@ -112,6 +117,11 @@ sed -e "s|SONAR_TOKEN|$SONAR_TOKEN|" \
     -e "s|SONAR_REFERENCE_BRANCH|$SONAR_REFERENCE_BRANCH|" \
     $SONAR_PROPERTIES_DIR/sonar-project.properties > $SONAR_PROPERTIES
 
+# The source and reference branches must differ to define new code
+if [ "$MET_GIT_NAME" != "$SONAR_REFERENCE_BRANCH" ]; then
+  echo "sonar.newCode.referenceBranch=${SONAR_REFERENCE_BRANCH}" >> $SONAR_PROPERTIES
+fi
+
 # Run the configure script
 time_command ./configure \
   BUFRLIB_NAME=${BUFRLIB_NAME} \

diff --git a/internal/scripts/sonarqube/python.sonar-project.properties b/internal/scripts/sonarqube/python.sonar-project.properties
@@ -15,4 +15,3 @@ sonar.host.url=SONAR_HOST_URL
 
 sonar.token=SONAR_TOKEN
 sonar.branch.name=SONAR_BRANCH_NAME
-sonar.newCode.referenceBranch=SONAR_REFERENCE_BRANCH
diff --git a/internal/scripts/sonarqube/run_sonarqube.sh b/internal/scripts/sonarqube/run_sonarqube.sh
@@ -130,7 +130,6 @@ else
       -e "s|SONAR_PROJECT_KEY|MET_python_NB|" \
       -e "s|SONAR_PROJECT_NAME|MET python Nightly Build|" \
       -e "s|SONAR_BRANCH_NAME|develop|" \
-      -e "s|SONAR_REFERENCE_BRANCH|develop|" \
       $SCRIPT_DIR/python.sonar-project.properties > $SONAR_PROPERTIES
 
   # Run SonarQube scan for Python code
@@ -143,7 +142,6 @@ else
       -e "s|SONAR_PROJECT_KEY|MET_develop_NB|" \
       -e "s|SONAR_PROJECT_NAME|MET Nightly Build|" \
       -e "s|SONAR_BRANCH_NAME|develop|" \
-      -e "s|SONAR_REFERENCE_BRANCH|develop|" \
       $SCRIPT_DIR/sonar-project.properties > $SONAR_PROPERTIES
 
   # Run SonarQube clean

diff --git a/internal/scripts/sonarqube/sonar-project.properties b/internal/scripts/sonarqube/sonar-project.properties
@@ -15,4 +15,3 @@ sonar.host.url=SONAR_HOST_URL
 
 sonar.token=SONAR_TOKEN
 sonar.branch.name=SONAR_BRANCH_NAME
-sonar.newCode.referenceBranch=SONAR_REFERENCE_BRANCH