Praqmagh-59 Draft for changed Jenkinsfile handling if needed

bicschneider · Aug 31, 2017 · b70be04 · b70be04
1 parent 93b64b6
commit b70be04
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/...rg/jenkinsci/plugins/pretestedintegration/scm/git/PretestedIntegrationAsGitPluginExt.java b/...rg/jenkinsci/plugins/pretestedintegration/scm/git/PretestedIntegrationAsGitPluginExt.java
@@ -16,6 +16,9 @@
 import org.jenkinsci.plugins.pretestedintegration.IntegrationStrategy;
 import org.jenkinsci.plugins.pretestedintegration.IntegrationStrategyDescriptor;
 import org.jenkinsci.plugins.pretestedintegration.exceptions.*;
+import org.jenkinsci.plugins.workflow.flow.FlowDefinition;
+import org.jenkinsci.plugins.workflow.job.WorkflowJob;
+import org.jenkinsci.plugins.workflow.job.WorkflowRun;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 import java.io.*;
@@ -119,17 +122,24 @@ public Revision decorateRevisionToBuild(
         try {
             gitBridge.evalBranchConfigurations(triggeredBranch, expandedIntegrationBranch, expandedRepo);
 
-            ChangelogCommand changelog = git.changelog();
-            changelog.includes(triggeredRevision.getSha1());
-            Writer out = new StringWriter();
-            listener.getLogger().println("Using 'Changelog to branch' strategy.");
-            changelog.excludes(expandedRepo + "/" + expandedIntegrationBranch);
-            changelog.to(out).execute();
-            if (out.toString().contains("Jenkinsfile")){
-                listener.getLogger().println(String.format("%s You have changed Jenkinsfile", LOG_PREFIX));
+            if (  run instanceof WorkflowRun ) {
+                WorkflowJob wf = (WorkflowJob) run.getParent();
+                FlowDefinition fd = wf.getDefinition();
+                Integer hash = fd.hashCode();
+                ChangelogCommand changelog = git.changelog();
+                changelog.includes(triggeredRevision.getSha1());
+                Writer out = new StringWriter();
+                listener.getLogger().println("Using 'Changelog to branch' strategy.");
+                changelog.excludes(expandedRepo + "/" + expandedIntegrationBranch);
+                changelog.to(out).execute();
+                if (out.toString().contains("Jenkinsfile")){
+                    listener.getLogger().println(String.format("%s You have changed Jenkinsfile", LOG_PREFIX));
 //                throw new IntegrationFailedException("You have changed Jenkinsfile");
+                }
+
             }
 
+
             listener.getLogger().println(String.format(LOG_PREFIX + "Checking out integration branch %s:", expandedIntegrationBranch));
             git.checkout().branch(expandedIntegrationBranch).ref(expandedRepo + "/" + expandedIntegrationBranch).deleteBranchIfExist(true).execute();
             ((GitIntegrationStrategy) gitBridge.integrationStrategy).integrateAsGitPluginExt(scm, run, git, listener, marked, triggeredRevision, gitBridge);