fixes fabric8io/fabric8-forge#624 so we add a github hook for github …

…based projects
fabric8io · Oct 18, 2016 · 0a75ad5 · 0a75ad5
1 parent 2ef7526
commit 0a75ad5
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/components/fabric8-devops-connector/pom.xml b/components/fabric8-devops-connector/pom.xml
@@ -49,6 +49,10 @@
               <artifactId>gitrepo-api</artifactId>
             </dependency>
         -->
+        <dependency>
+            <groupId>io.fabric8</groupId>
+            <artifactId>fabric8-project-utils</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.fabric8</groupId>
             <artifactId>letschat-api</artifactId>

diff --git a/...s/fabric8-devops-connector/src/main/java/io/fabric8/devops/connector/DevOpsConnector.java b/...s/fabric8-devops-connector/src/main/java/io/fabric8/devops/connector/DevOpsConnector.java
@@ -40,6 +40,7 @@
 import io.fabric8.openshift.api.model.BuildSource;
 import io.fabric8.openshift.api.model.GitBuildSource;
 import io.fabric8.openshift.client.OpenShiftClient;
+import io.fabric8.project.support.GitUtils;
 import io.fabric8.repo.git.GitRepoClient;
 import io.fabric8.repo.git.GitRepoKubernetes;
 import io.fabric8.taiga.ModuleDTO;
@@ -50,6 +51,7 @@
 import io.fabric8.utils.DomHelper;
 import io.fabric8.utils.GitHelpers;
 import io.fabric8.utils.IOHelpers;
+import io.fabric8.utils.Objects;
 import io.fabric8.utils.Strings;
 import io.fabric8.utils.Systems;
 import io.fabric8.utils.URLUtils;
@@ -97,6 +99,8 @@
 import java.io.StringReader;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1085,6 +1089,16 @@ protected void addJenkinsScmTrigger(String jenkinsJobUrl) {
                 } else {
                     triggerElement = (Element) triggers.item(0);
                 }
+                String hostName = GitUtils.getGitHostName(gitUrl);
+                getLog().info("using git host: " + hostName);
+                if (Objects.equal("github.com", hostName)) {
+                    Element githubTrigger = DomHelper.firstChild(triggerElement, "com.cloudbees.jenkins.GitHubPushTrigger");
+                    if (githubTrigger == null) {
+                        githubTrigger = DomHelper.addChildElement(triggerElement, "com.cloudbees.jenkins.GitHubPushTrigger");
+                        githubTrigger.setAttribute("plugin", "github@1.14.0");
+                        DomHelper.addChildElement(githubTrigger, "spec");
+                    }
+                }
                 Element scmTrigger = DomHelper.addChildElement(triggerElement, "hudson.triggers.SCMTrigger");
                 DomHelper.addChildElement(scmTrigger, "spec", "* * * * * ");
                 DomHelper.addChildElement(scmTrigger, "ignorePostCommitHooks", "false");