Commit ba984a71 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '8-documentation-sonar_branch_name-should-not-be-mandatory' into 'main' 

Resolve "[Documentation] SONAR_BRANCH_NAME should not be mandatory"

Closes #8

See merge request to-be-continuous/defectdojo!17
parents b0af8543 f3bd1e6e

README.md

+1 −2
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ SonarQube is specific: contrary to other jobs, sonar job does not generate any a 
In order to launch SonarQube HTML-report generation, the following variables must be set:



- SONAR_URL (used by sonar template)

- SONAR_BRANCH_NAME (used by sonar template)

- SONAR_AUTH_TOKEN (used by sonar template)

- DEFECTDOJO_SONARQUBE_APPLICATION

- DEFECTDOJO_SONARQUBE_PROJECT_KEY
@@ -132,7 +131,7 @@ sonar-report \ 
    --sonarcomponent="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

    --project="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

    --application="${DEFECTDOJO_SONARQUBE_APPLICATION}" \

    --branch="${SONAR_BRANCH_NAME}" \

    --branch="${CI_COMMIT_REF_NAME}" \

    --sonartoken="${SONAR_AUTH_TOKEN}" \

    --sinceleakperiod="${DEFECTDOJO_SONARQUBE_SINCELEAKPERIOD}" \

    --noSecurityHotspot="${DEFECTDOJO_SONARQUBE_NOSECURITYHOTSPOT}" \

templates/gitlab-ci-defectdojo.yml

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ variables: 
    # Sonar

    # template: sonar

    sonarqube_report=0

    if [ -n "${SONAR_URL}" ] && [ -n "${SONAR_AUTH_TOKEN}" ] && [ -n "${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" ] && [ -n "${DEFECTDOJO_SONARQUBE_APPLICATION}" ] && [ -n "${SONAR_BRANCH_NAME}" ]; then

    if [ -n "${SONAR_URL}" ] && [ -n "${SONAR_AUTH_TOKEN}" ] && [ -n "${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" ] && [ -n "${DEFECTDOJO_SONARQUBE_APPLICATION}" ]; then

      sonar_report="sonar-report.html"

      log_info "sonar-report will call ${SONAR_URL}/api/issues/search?componentKeys=${DEFECTDOJO_SONARQUBE_PROJECT_KEY}&ps=500&p=1&statuses=OPEN,CONFIRMED,REOPENED&resolutions=&s=STATUS&asc=no&types=VULNERABILITY"

      sonar-report \
@@ -171,7 +171,7 @@ variables: 
      --sonarcomponent="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

      --project="${DEFECTDOJO_SONARQUBE_PROJECT_KEY}" \

      --application="${DEFECTDOJO_SONARQUBE_APPLICATION}" \

      --branch="${SONAR_BRANCH_NAME}" \

      --branch="${CI_COMMIT_REF_NAME}" \

      --sonartoken="${SONAR_AUTH_TOKEN}" \

      --sinceleakperiod="${DEFECTDOJO_SONARQUBE_SINCELEAKPERIOD}" \

      --noSecurityHotspot="${DEFECTDOJO_SONARQUBE_NOSECURITYHOTSPOT}" \