FIX : get jobs inside folders

jenkinsci · Dec 6, 2023 · 5228546 · 5228546
1 parent f24f7f9
commit 5228546
Show file tree

Hide file tree

Showing 2 changed files with 221 additions and 206 deletions.
diff --git a/src/main/java/com/jenkins/testresultsaggregator/TestResultsAggregator.java b/src/main/java/com/jenkins/testresultsaggregator/TestResultsAggregator.java
@@ -42,9 +42,6 @@
 import hudson.tasks.Publisher;
 import hudson.util.FormValidation;
 import hudson.util.Secret;
-
-import hudson.util.VariableResolver;
-
 import jenkins.model.Jenkins;
 import jenkins.tasks.SimpleBuildStep;
 import net.sf.json.JSONObject;
@@ -185,7 +182,7 @@ public void perform(Run<?, ?> run, FilePath workspace, EnvVars env, Launcher lau
 				aggregatedSavedData = getPreviousData(run.getPreviousSuccessfulBuild(), validatedData);
 			}
 			// Collect Data
-			Collector collector = new Collector(jenkinsUrl, desc.getUsername(), desc.getPassword(), listener.getLogger());
+			Collector collector = new Collector(jenkinsUrl, desc.getUsername(), desc.getPassword(), listener.getLogger(), validatedData);
 			collector.collectResults(validatedData, compareWithPrevious(), ignoreRunningJobs());
 			collector.closeJenkinsConnection();
 			// Analyze Results
@@ -225,7 +222,7 @@ public boolean perform(final AbstractBuild build, final Launcher launcher, final
 				aggregatedSavedData = getPreviousData(build, validatedData);
 			}
 			// Collect Data
-			Collector collector = new Collector(jenkinsUrl, desc.getUsername(), desc.getPassword(), listener.getLogger());
+			Collector collector = new Collector(jenkinsUrl, desc.getUsername(), desc.getPassword(), listener.getLogger(), validatedData);
 			collector.collectResults(validatedData, compareWithPrevious(), ignoreRunningJobs());
 			collector.closeJenkinsConnection();
 			// Analyze Results
@@ -347,7 +344,7 @@ public FormValidation doCheckOutOfDateResults(@QueryParameter final String outOf
 
 		@RequirePOST
 		public FormValidation doTestApiConnection(@QueryParameter final String jenkinsUrl, @QueryParameter final String username, @QueryParameter final Secret password) {
-      // https://www.jenkins.io/doc/developer/security/form-validation/
+			// https://www.jenkins.io/doc/developer/security/form-validation/
 			Jenkins.get().checkPermission(Jenkins.ADMINISTER);
 			try {
 				JenkinsServer jenkins = new JenkinsServer(new URI(jenkinsUrl), username, password.getPlainText());