US #2048033: Extend polling to send/receive custom properties

Roy-Lu · Jan 26, 2023 · 473dcf8 · 473dcf8
1 parent 2a62478
commit 473dcf8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/...rofocus/application/automation/tools/octane/events/OutputEnvironmentParametersHelper.java b/...rofocus/application/automation/tools/octane/events/OutputEnvironmentParametersHelper.java
@@ -7,6 +7,7 @@
 import hudson.model.AbstractBuild;
 import hudson.model.BuildableItemWithBuildWrappers;
 import hudson.model.Job;
+import hudson.model.Run;
 
 import java.io.IOException;
 import java.util.*;
@@ -17,23 +18,26 @@ public class OutputEnvironmentParametersHelper {
 
 	public static final String SPLIT_SYMBOL = " ";
 
-	public static Map<String, String> getOutputEnvironmentParams(AbstractBuild build) {
-		EnvVars environment = getEnvironment(build);
+	public static Map<String, String> getOutputEnvironmentParams(Run run) {
+		EnvVars environment = getEnvironment(run);
 		if (environment == null) {
 			return Collections.emptyMap();
 		} else {
 			List<String> paramKeysList = new ArrayList<>();
 			paramKeysList.addAll(getGlobalParamsList());
-			paramKeysList.addAll(getJobParamsList(build));
+			paramKeysList.addAll(getJobParamsList(run));
 
 			if (paramKeysList.isEmpty()) return Collections.emptyMap();
 
 			Map<String, String> outputEnvParams = new HashMap<>();
-			Set<String> sensitiveBuildVariables = build.getSensitiveBuildVariables();
+			Set<String> sensitiveBuildVariables =null;
+			if (run instanceof AbstractBuild) {
+				sensitiveBuildVariables = ((AbstractBuild) run).getSensitiveBuildVariables();
+			}
 
 			String value;
 			for (String key : paramKeysList) {
-				if (sensitiveBuildVariables.contains(key)) continue;
+				if (sensitiveBuildVariables != null && sensitiveBuildVariables.contains(key)) continue;
 				value = environment.get(key);
 				if (value != null) {
 					outputEnvParams.put(key, value);
@@ -43,10 +47,10 @@ public static Map<String, String> getOutputEnvironmentParams(AbstractBuild build
 		}
 	}
 
-	private static EnvVars getEnvironment(AbstractBuild build) {
+	private static EnvVars getEnvironment(Run run) {
 		EnvVars environment = null;
 		try {
-			environment = build.getEnvironment(null);
+			environment = run.getEnvironment(null);
 		} catch (IOException | InterruptedException ignored) {
 		}
 		return environment;
@@ -61,8 +65,8 @@ private static List<String> getGlobalParamsList() {
 		}
 	}
 
-	private static List<String> getJobParamsList(AbstractBuild build) {
-		Job<?, ?> job = build.getParent();
+	private static List<String> getJobParamsList(Run run) {
+		Job<?, ?> job = run.getParent();
 		if (job instanceof BuildableItemWithBuildWrappers) {
 			String paramsStr = ((BuildableItemWithBuildWrappers) job).getBuildWrappersList().
 					get(OctaneBuildWrapper.class).getOutputEnvironmentParameters();

diff --git a/...plication/automation/tools/octane/model/processors/projects/AbstractProjectProcessor.java b/...plication/automation/tools/octane/model/processors/projects/AbstractProjectProcessor.java
@@ -52,6 +52,8 @@
 import java.util.List;
 import java.util.Set;
 
+import static com.microfocus.application.automation.tools.octane.events.OutputEnvironmentParametersHelper.getOutputEnvironmentParams;
+
 /**
  * Created with IntelliJ IDEA.
  * User: gullery
@@ -209,6 +211,7 @@ public CIBuildStatusInfo getBuildStatus(String paramName, String paramValue) {
 							} else {
 								status.setBuildStatus(CIBuildStatus.FINISHED);
 								status.setResult(BuildHandlerUtils.translateRunResult(aBuild));
+								status.setEnvironmentOutputtedParameters(getOutputEnvironmentParams(aBuild));
 							}
 							status.setAllBuildParams(ParameterProcessors.getInstances(aBuild));
 							status.setBuildCiId(BuildHandlerUtils.getBuildCiId(aBuild));