Merge pull request #237 from MicroFocus/octane-dev-latest

grount · web-flow · commit efcdb89e4c79 · 2019-05-02T14:25:53.000+03:00
Octane 5.7.4 fixes
diff --git a/pom.xml b/pom.xml
@@ -470,7 +470,7 @@
 		<dependency>
 			<artifactId>integrations-sdk</artifactId>
 			<groupId>com.hpe.adm.octane.ciplugins</groupId>
-			<version>2.0.40</version>
+			<version>2.0.41</version>
 		</dependency>
 
 		<!--BUILDER providers integration-->
diff --git a/src/main/java/com/microfocus/application/automation/tools/octane/configuration/FodConfigUtil.java b/src/main/java/com/microfocus/application/automation/tools/octane/configuration/FodConfigUtil.java
@@ -78,6 +78,29 @@ public static Long getFODReleaseFromBuild(AbstractBuild build) {
     }
 
     private static Long getRelease(AbstractProject project) {
+        Long release = getReleaseVersionBefore12(project);
+        if(release != null){
+            logger.debug("A Version before 12 is detected.");
+            return release;
+        }
+
+        release = getReleaseVersion12(project);
+        if(release != null) {
+            logger.debug("A Version 12 or higher is detected.");
+        }
+        logger.debug("No release was set to this job");
+        return release;
+    }
+    private static Long getReleaseVersion12(AbstractProject project){
+        for (Object publisher : project.getPublishersList()) {
+            if (publisher instanceof Publisher &&
+                    FOD_STATIC_ASSESSMENT_STEP.equals(publisher.getClass().getName())) {
+                return getReleaseByReflectionV12(publisher);
+            }
+        }
+        return null;
+    }
+    private static Long getReleaseVersionBefore12(AbstractProject project){
         for (Object publisher : project.getPublishersList()) {
             if (publisher instanceof Publisher &&
                     FOD_STATIC_ASSESSMENT_STEP.equals(publisher.getClass().getName())) {
@@ -86,7 +109,14 @@ private static Long getRelease(AbstractProject project) {
         }
         return null;
     }
+    private static Long getReleaseByReflectionV12(Object fodPublisher) {
 
+        Object sharedBuildStep = getFieldValue(fodPublisher, "sharedBuildStep");
+        if(sharedBuildStep == null){
+            return null;
+        }
+        return getReleaseByReflection(sharedBuildStep);
+    }
     private static Long getReleaseByReflection(Object fodPublisher) {
 
         Object modelObj = getFieldValue(fodPublisher, "model");
diff --git a/src/main/java/com/microfocus/application/automation/tools/octane/model/processors/projects/AbstractProjectProcessor.java b/src/main/java/com/microfocus/application/automation/tools/octane/model/processors/projects/AbstractProjectProcessor.java
@@ -21,11 +21,15 @@
 package com.microfocus.application.automation.tools.octane.model.processors.projects;
 
 import com.hp.octane.integrations.dto.pipelines.PipelinePhase;
-import com.microfocus.application.automation.tools.octane.model.processors.builders.*;
+import com.microfocus.application.automation.tools.octane.executor.UftConstants;
+import com.microfocus.application.automation.tools.octane.model.processors.builders.AbstractBuilderProcessor;
+import com.microfocus.application.automation.tools.octane.model.processors.builders.BuildTriggerProcessor;
+import com.microfocus.application.automation.tools.octane.model.processors.builders.ParameterizedTriggerProcessor;
 import com.microfocus.application.automation.tools.octane.tests.build.BuildHandlerUtils;
 import hudson.model.*;
 import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
+import jenkins.model.Jenkins;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -76,28 +80,51 @@ public void scheduleBuild(Cause cause, ParametersAction parametersAction) {
 	}
 
 	public void cancelBuild(Cause cause, ParametersAction parametersAction) {
+		String suiteId = (String) parametersAction.getParameter(UftConstants.SUITE_ID_PARAMETER_NAME).getValue();
+		String suiteRunId = (String) parametersAction.getParameter(UftConstants.SUITE_RUN_ID_PARAMETER_NAME).getValue();
+		logger.info("cancelBuild for suiteId=" + suiteId +", suiteRunId=" + suiteRunId);
 		if (job instanceof AbstractProject) {
 			AbstractProject project = (AbstractProject) job;
+			Queue queue = Jenkins.get().getQueue();
+			queue.getItems(project).forEach(item -> {
+				item.getActions(ParametersAction.class).forEach(action -> {
+					if (checkSuiteIdParamsExistAndEqual(action, suiteId, suiteRunId)) {
+						try {
+							logger.info("canceling item in queue : " + item.getDisplayName());
+							queue.cancel(item);
+						} catch (Exception e) {
+							logger.warn("Failed to cancel '" + item.getDisplayName() + "' in queue : " + e.getMessage(), e);
+						}
+					}
+				});
+			});
+
 			project.getBuilds().forEach(build -> {
 				if (build instanceof AbstractBuild) {
-					AbstractBuild abuild = (AbstractBuild) build;
-					abuild.getActions(ParametersAction.class).forEach(action -> {
-						if (action.getParameter("suiteId").getValue().equals(parametersAction.getParameter("suiteId").getValue())
-								&& action.getParameter("suiteRunId").getValue().equals(parametersAction.getParameter("suiteRunId").getValue())) {
+					AbstractBuild aBuild = (AbstractBuild) build;
+					aBuild.getActions(ParametersAction.class).forEach(action -> {
+						if (checkSuiteIdParamsExistAndEqual(action, suiteId, suiteRunId)) {
 							try {
-								abuild.doStop();
+								aBuild.doStop();
 							} catch (Exception e) {
-								logger.warn(e);
+								logger.warn("Failed to stop build '" + aBuild.getDisplayName() + "' :" + e.getMessage(), e);
 							}
 						}
 					});
 				}
 			});
 		} else {
-			throw new IllegalStateException("unsupported job CAN NOT be stop");
+			throw new IllegalStateException("unsupported job CAN NOT be stopped");
 		}
 	}
 
+	private boolean checkSuiteIdParamsExistAndEqual(ParametersAction parametersAction, String suiteId, String suiteRunId) {
+		ParameterValue suiteIdPV = parametersAction.getParameter(UftConstants.SUITE_ID_PARAMETER_NAME);
+		ParameterValue suiteRunIdPV = parametersAction.getParameter(UftConstants.SUITE_RUN_ID_PARAMETER_NAME);
+		return (suiteIdPV != null && suiteRunIdPV != null && suiteIdPV.getValue().equals(suiteId)
+				&& suiteRunIdPV.getValue().equals(suiteRunId));
+	}
+
 	/**
 	 * Retrieve Job's CI ID
 	 * return the job name, in case of a folder job, this method returns the refactored
diff --git a/src/main/java/com/microfocus/application/automation/tools/octane/model/processors/scm/GitSCMProcessor.java b/src/main/java/com/microfocus/application/automation/tools/octane/model/processors/scm/GitSCMProcessor.java
@@ -97,11 +97,14 @@ private SCMData enrichLinesOnSCMData(SCMData scmData, AbstractBuild build) {
             if (workspace != null) {
                 File repoDir = new File(getRemoteString(build) + File.separator + ".git");
                 scmData = workspace.act(new LineEnricherCallable(repoDir, scmData));
+                logger.info("Line enricher: process took: " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");
+            }
+            else {
+                logger.warn("Line enricher: workspace is null");
             }
         } catch (Exception e1) {
-            logger.error("Line enricher: FAILED. could not enrich lines on SCM Data " + e1);
+            logger.error("Line enricher: FAILED. could not enrich lines on SCM Data ", e1);
         }
-        logger.info("Line enricher: process took: " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");
         return scmData;
     }
 
@@ -349,7 +352,7 @@ public SCMData invoke(File rootDir, VirtualChannel channel) throws IOException {
             df.setDetectRenames(true);
 
             //add blame data to scm data
-            Set<String> committedFiles = getCommittedFiles(scmData);
+            Set<String> committedFiles = getAddedOrEditedFiles(scmData);
             List<SCMFileBlame> fileBlameList = getBlameData(repo, committedFiles);
             scmData.setFileBlameList(fileBlameList);
 
@@ -396,10 +399,10 @@ public SCMData invoke(File rootDir, VirtualChannel channel) throws IOException {
         }
     }
 
-    private static Set<String> getCommittedFiles(SCMData scmData) {
+    private static Set<String> getAddedOrEditedFiles(SCMData scmData) {
         Set<String> filesCommittedInPPR = new HashSet<>();
         for (SCMCommit curCommit : scmData.getCommits()) {
-            curCommit.getChanges().forEach(change -> filesCommittedInPPR.add(change.getFile()));
+            curCommit.getChanges().stream().filter(change -> !change.getType().equals("delete")).forEach(change -> filesCommittedInPPR.add(change.getFile()));
         }
         return filesCommittedInPPR;
     }

Original file line number	Diff line number	Diff line change
`@@ -97,11 +97,14 @@ private SCMData enrichLinesOnSCMData(SCMData scmData, AbstractBuild build) {`
`97`	`97`	`if (workspace != null) {`
`98`	`98`	`File repoDir = new File(getRemoteString(build) + File.separator + ".git");`
`99`	`99`	`scmData = workspace.act(new LineEnricherCallable(repoDir, scmData));`
	`100`	`+ logger.info("Line enricher: process took: " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");`
	`101`	`+ }`
	`102`	`+ else {`
	`103`	`+ logger.warn("Line enricher: workspace is null");`
`100`	`104`	`}`
`101`	`105`	`} catch (Exception e1) {`
`102`		`- logger.error("Line enricher: FAILED. could not enrich lines on SCM Data " + e1);`
	`106`	`+ logger.error("Line enricher: FAILED. could not enrich lines on SCM Data ", e1);`
`103`	`107`	`}`
`104`		`- logger.info("Line enricher: process took: " + ((System.currentTimeMillis() - startTime) / 1000) + " seconds");`
`105`	`108`	`return scmData;`
`106`	`109`	`}`
`107`	`110`
`@@ -349,7 +352,7 @@ public SCMData invoke(File rootDir, VirtualChannel channel) throws IOException {`
`349`	`352`	`df.setDetectRenames(true);`
`350`	`353`
`351`	`354`	`//add blame data to scm data`
`352`		`- Set<String> committedFiles = getCommittedFiles(scmData);`
	`355`	`+ Set<String> committedFiles = getAddedOrEditedFiles(scmData);`
`353`	`356`	`List<SCMFileBlame> fileBlameList = getBlameData(repo, committedFiles);`
`354`	`357`	`scmData.setFileBlameList(fileBlameList);`
`355`	`358`
`@@ -396,10 +399,10 @@ public SCMData invoke(File rootDir, VirtualChannel channel) throws IOException {`
`396`	`399`	`}`
`397`	`400`	`}`
`398`	`401`
`399`		`- private static Set<String> getCommittedFiles(SCMData scmData) {`
	`402`	`+ private static Set<String> getAddedOrEditedFiles(SCMData scmData) {`
`400`	`403`	`Set<String> filesCommittedInPPR = new HashSet<>();`
`401`	`404`	`for (SCMCommit curCommit : scmData.getCommits()) {`
`402`		`- curCommit.getChanges().forEach(change -> filesCommittedInPPR.add(change.getFile()));`
	`405`	`+ curCommit.getChanges().stream().filter(change -> !change.getType().equals("delete")).forEach(change -> filesCommittedInPPR.add(change.getFile()));`
`403`	`406`	`}`
`404`	`407`	`return filesCommittedInPPR;`
`405`	`408`	`}`