Feature #2379 main_v11.1 single_sq_project (#2866)

dtcenter · Apr 18, 2024 · 57d404a · 57d404a
1 parent 7a8712d
commit 57d404a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/internal/scripts/docker/build_met_sonarqube.sh b/internal/scripts/docker/build_met_sonarqube.sh
@@ -84,9 +84,7 @@ SONAR_PROPERTIES=sonar-project.properties
 
 # Configure the sonar-project.properties
 [ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
-sed -e "s|SONAR_PROJECT_KEY|MET-GHA|" \
-    -e "s|SONAR_PROJECT_NAME|MET 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|$MET_GIT_NAME|" \

diff --git a/internal/scripts/sonarqube/run_sonarqube.sh b/internal/scripts/sonarqube/run_sonarqube.sh
@@ -130,9 +130,7 @@ if [ -z "$SONAR_TOKEN" ]; then
   exit 1
 else
   [ -e $SONAR_PROPERTIES ] && rm $SONAR_PROPERTIES
-  sed -e "s|SONAR_PROJECT_KEY|MET_NB|" \
-      -e "s|SONAR_PROJECT_NAME|MET 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=MET
+sonar.projectName=MET
 sonar.projectVersion=SONAR_PROJECT_VERSION
 sonar.branch.name=SONAR_BRANCH_NAME
 sonar.sources=src,scripts/python,data/wrappers