Merge branch 'T6518-harbormaster-notify-jenkins-step'

* T6518-harbormaster-notify-jenkins-step:
  Convert "Jenkins Host" (without protocol) into "Jenkins URI" (with protocol)

Author: aik099

src/applications/diffusion/JenkinsAPIRequest.php

@@ -93,7 +93,7 @@ public function query() {
   }
 
   private function buildUrl() {
-    $url = 'https://'.PhabricatorEnv::getEnvConfig('jenkins.host');
+    $url = rtrim(PhabricatorEnv::getEnvConfig('jenkins.base-uri'), '/');
 
     if ($this->jobName) {
       $url .= '/job/'.$this->jobName;

src/applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php

@@ -21,8 +21,9 @@ public function getGroup() {
 
   public function getOptions() {
     return array(
-      $this->newOption('jenkins.host', 'string', null)
-        ->setDescription(pht('Jenkins installation hostname.')),
+      $this->newOption('jenkins.base-uri', 'string', null)
+        ->setDescription(pht('URI where Jenkins is installed.'))
+        ->addExample('http://jenkins.example.com/', pht('Valid Setting')),
       $this->newOption('jenkins.user-id', 'string', null)
         ->setDescription(pht('Username for accessing Jenkins.')),
       $this->newOption('jenkins.api-token', 'string', null)

src/applications/harbormaster/step/HarbormasterNotifyJenkinsBuildStepImplementation.php

@@ -62,7 +62,7 @@ protected function notifyGit() {
   }
 
   protected function notifySVN() {
-    $uri = 'https://'.PhabricatorEnv::getEnvConfig('jenkins.host');
+    $uri = rtrim(PhabricatorEnv::getEnvConfig('jenkins.base-uri'), '/');
     $uri .= '/subversion/%s/notifyCommit?rev=%s';
 
     $repository_uuid = PhabricatorEnv::getEnvConfig('jenkins.repository-uuid');