Skip to content

SONARJAVA-6933 ci-autofix: Investigate red master CI - #6109

Closed
hashicorp-vault-sonar-prod[bot] wants to merge 1 commit into
masterfrom
ci-autofix/102448842840
Closed

SONARJAVA-6933 ci-autofix: Investigate red master CI#6109
hashicorp-vault-sonar-prod[bot] wants to merge 1 commit into
masterfrom
ci-autofix/102448842840

Conversation

@hashicorp-vault-sonar-prod

@hashicorp-vault-sonar-prod hashicorp-vault-sonar-prod Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

The latest CI run on master is red: SonarQube Code Analysis (run 102448842840).

This PR was opened with an empty commit to reserve a place for the CI fix.

@hashicorp-vault-sonar-prod

Copy link
Copy Markdown
Contributor Author

gitar auto-apply:on

@hashicorp-vault-sonar-prod

Copy link
Copy Markdown
Contributor Author

gitar master CI is failing https://next.sonarqube.com/sonarqube/dashboard?id=org.sonarsource.java%3Ajava&branch=master. Investigate the failure and fix it in this PR if possible. If not, leave a comment with your investigation results.

@hashicorp-vault-sonar-prod hashicorp-vault-sonar-prod Bot changed the title ci-autofix: Investigate red master CI SONARJAVA-6933 ci-autofix: Investigate red master CI Sep 9, 2026
@hashicorp-vault-sonar-prod

hashicorp-vault-sonar-prod Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor Author

SONARJAVA-6933

@gitar-bot

gitar-bot Bot commented Sep 9, 2026

Copy link
Copy Markdown

Investigated run 102448842840. This is not a build/test failure on master — the Build workflow for the same commit (7ed22b9f) succeeded. The failure is in the separate dogfood merge workflow, which does an octopus merge of master into the long-lived integration branch dogfood/epic-SONARJAVA-6237.

The merge fails with a real content conflict:

Auto-merging java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java
ERROR: content conflict in java-checks/src/main/java/org/sonar/java/checks/tests/AssertionsInTestsCheck.java
fatal: merge program failed
...
master has conflicts with : refs/remotes/origin/dogfood/epic-SONARJAVA-6237
OCTOPUS FAILED

Root cause: #6096 (merged into master just before this) moved UnitTestUtils from package org.sonar.java.utils to org.sonar.java.checks.helpers, touching AbstractAssertionVisitor.java and AssertionsInTestsCheck.java. The dogfood/epic-SONARJAVA-6237 branch has its own diverging changes to the same imports in those files, so the automatic octopus merge can't reconcile them.

This isn't something to fix on master or in this PR — there's no defect in master's code or tests. It requires manually resolving the merge conflict on/with the dogfood/epic-SONARJAVA-6237 branch (rebasing that branch on current master, or updating the octopus merge to skip/handle it), which is outside the scope of what this PR's diff can address. I'm closing out this investigation without a code change; someone with context on the epic-SONARJAVA-6237 work will need to reconcile that branch with master.

@sonarqube-next

sonarqube-next Bot commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Quality Gate passed Quality Gate passed

Issues
0 New issues
0 Fixed issues
0 Accepted issues

Measures
0 Security Hotspots
0 Dependency risks
No data about Coverage
No data about Duplication

See analysis details on SonarQube

@mary-georgiou
mary-georgiou deleted the ci-autofix/102448842840 branch September 9, 2026 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant