Per #366, push to a single METcalcpy SonarQube project

dtcenter · Apr 19, 2024 · 501fd3d · 501fd3d
1 parent e5291fc
commit 501fd3d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/.github/jobs/configure_sonarqube.sh b/.github/jobs/configure_sonarqube.sh
@@ -47,9 +47,7 @@ fi
 
 # Configure the sonar-project.properties
 [ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
-sed -e "s|SONAR_PROJECT_KEY|METcalcpy-GHA|" \
-    -e "s|SONAR_PROJECT_NAME|METcalcpy GHA|" \
-    -e "s|SONAR_PROJECT_VERSION|$SONAR_PROJECT_VERSION|" \
+sed -e "s|SONAR_PROJECT_VERSION|$SONAR_PROJECT_VERSION|" \
     -e "s|SONAR_HOST_URL|$SONAR_HOST_URL|" \
     -e "s|SONAR_TOKEN|$SONAR_TOKEN|" \
     -e "s|SONAR_BRANCH_NAME|$SOURCE_BRANCH|" \

diff --git a/internal/scripts/sonarqube/run_sonarqube.sh b/internal/scripts/sonarqube/run_sonarqube.sh
@@ -118,9 +118,7 @@ SONAR_PROPERTIES=sonar-project.properties
 
 # Configure the sonar-project.properties
 [ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
-sed -e "s|SONAR_PROJECT_KEY|METcalcpy_NB|" \
-    -e "s|SONAR_PROJECT_NAME|METcalcpy Nightly Build|" \
-    -e "s|SONAR_PROJECT_VERSION|$SONAR_PROJECT_VERSION|" \
+sed -e "s|SONAR_PROJECT_VERSION|$SONAR_PROJECT_VERSION|" \
     -e "s|SONAR_HOST_URL|$SONAR_HOST_URL|" \
     -e "s|SONAR_TOKEN|$SONAR_TOKEN|" \
     -e "s|SONAR_BRANCH_NAME|${1}|" \

diff --git a/internal/scripts/sonarqube/sonar-project.properties b/internal/scripts/sonarqube/sonar-project.properties
@@ -1,6 +1,6 @@
 # Project and source code settings
-sonar.projectKey=SONAR_PROJECT_KEY
-sonar.projectName=SONAR_PROJECT_NAME
+sonar.projectKey=METcalcpy
+sonar.projectName=METcalcpy
 sonar.projectVersion=SONAR_PROJECT_VERSION
 sonar.branch.name=SONAR_BRANCH_NAME
 sonar.sources=metcalcpy,scratch,test