Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sonar-scanner with -Dsonar.qualitygate.wait=true support #130

Merged
merged 1 commit into from
Mar 1, 2022
Merged

sonar-scanner with -Dsonar.qualitygate.wait=true support #130

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 29 additions & 17 deletions src/main/java/jenkinsci/plugins/influxdb/generators/SonarQubePointGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,14 @@ public class SonarQubePointGenerator extends AbstractPointGenerator {
private static final String TASK_ID_PATTERN_IN_REPORT = "ceTaskId=(.*)";
private static final String TASK_URL_PATTERN_IN_REPORT = "ceTaskUrl=(.*)";
// Patterns used for data extraction from build log
private static final String URL_PATTERN_IN_LOGS = ".*" + Pattern.quote("ANALYSIS SUCCESSFUL, you can browse ")
private static final String URL_PATTERN_IN_LOGS_ANALYSIS = ".*" + Pattern.quote("ANALYSIS SUCCESSFUL, you can browse ")
+ "(.*)";
private static final String TASK_URL_PATTERN_IN_LOGS = ".*" + Pattern.quote("More about the report processing at ")
+ "(.*)";
private static final String PROJECT_NAME_PATTERN_IN_LOGS = ".*" + Pattern.quote("Project key: ")
+ "(.*)";
private static final String URL_PATTERN_IN_LOGS_QUALITY_GATE_STATUS = ".*" + Pattern.quote("QUALITY GATE STATUS: ")
+ "(.*)" + Pattern.quote(" - View details on ") + "(.*)";

private String projectKey = null;
private String sonarBuildURL = null;
Expand Down Expand Up @@ -213,7 +215,9 @@ public Point[] generate() {

Point point = null;
try {
waitForQualityGateTask();
if(sonarBuildTaskId != null){
waitForQualityGateTask();
}

point = buildPoint("sonarqube_data", customPrefix, build)
.addField(BUILD_DISPLAY_NAME, build.getDisplayName())
Expand Down Expand Up @@ -277,26 +281,34 @@ private String[] getSonarProjectFromBuildLog(Run<?, ?> build) throws IOException

try (BufferedReader br = new BufferedReader(build.getLogReader())) {
String line;
Pattern p_url = Pattern.compile(URL_PATTERN_IN_LOGS);
Matcher match;
Pattern p_analysis_url = Pattern.compile(URL_PATTERN_IN_LOGS_ANALYSIS);
Pattern p_qg_url = Pattern.compile(URL_PATTERN_IN_LOGS_QUALITY_GATE_STATUS);
Pattern p_taskUrl = Pattern.compile(TASK_URL_PATTERN_IN_LOGS);
Pattern p_projName = Pattern.compile(PROJECT_NAME_PATTERN_IN_LOGS);

while ((line = br.readLine()) != null) {
Matcher match = p_projName.matcher(line);
match = p_projName.matcher(line);
if (match.matches()) {
projName = match.group(1);
} else {
match = p_url.matcher(line);
if (match.matches()) {
url = match.group(1);
}
else {
match = p_taskUrl.matcher(line);
if (match.matches()) {
taskUrl = match.group(1);
taskId = taskUrl.split("=")[1];
break; // No need to search for other lines
}
}
continue;
}
match = p_qg_url.matcher(line);
if (match.matches()) {
url = match.group(2);
//Task already executed. No need to search for other lines
break;
}
match = p_analysis_url.matcher(line);
if (match.matches()) {
url = match.group(1);
continue;
}
match = p_taskUrl.matcher(line);
if (match.matches()) {
taskUrl = match.group(1);
taskId = taskUrl.split("=")[1];
break; // No need to search for other lines
}
}
}
Expand Down