Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/qualification_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ def _merge_queue_sonar_workflow(document: dict[str, Any], target: str, path: str
"-Dsonar.scm.exclusions.disabled=true "
"-Dsonar.rust.clippy.enabled=false "
"-Dsonar.working.directory=${{ runner.temp }}/queue-sonar-work "
"-Dsonar.qualitygate.wait=true -Dsonar.qualitygate.timeout=300"
"-Dsonar.qualitygate.wait=false"
)}},
]

Expand Down
5 changes: 3 additions & 2 deletions tests/fixtures/merge-queue-sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ jobs:

# No candidate command, dependency installation or scanner configuration
# executes with this token. Only the pinned static scanner receives it.
# The required Sonar App check gates this SHA. Upload the analysis and
# let GitHub wait for that App's quality-gate result.
- uses: SonarSource/sonarqube-scan-action@d209202bc7d53ff1cc128f7f907dac145c9d6ae9 # v8.3.0
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Expand All @@ -60,5 +62,4 @@ jobs:
-Dsonar.scm.exclusions.disabled=true
-Dsonar.rust.clippy.enabled=false
-Dsonar.working.directory=${{ runner.temp }}/queue-sonar-work
-Dsonar.qualitygate.wait=true
-Dsonar.qualitygate.timeout=300
-Dsonar.qualitygate.wait=false
2 changes: 1 addition & 1 deletion tests/test_qualification_policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def test_merge_queue_sonar_refuses_candidate_execution_and_privilege_expansion(s
source.replace("queue-sonar-work", ".sonar-candidate/.scannerwork"),
source.replace("projectBaseDir: .sonar-candidate", "projectBaseDir: ."),
source.replace("sonar.rust.clippy.enabled=false", "sonar.rust.clippy.enabled=true"),
source.replace("qualitygate.timeout=300", "qualitygate.timeout=300 -Dsonar.host.url=https://example.invalid"),
source.replace("qualitygate.wait=false", "qualitygate.wait=false -Dsonar.host.url=https://example.invalid"),
source + " - run: ./.sonar-candidate/after-scan.sh\n",
source + " - uses: ./candidate-action # local\n",
]
Expand Down
Loading