Skip to content

Commit 38d7329

Browse files
committed
Convert "Jenkins Host" (without protocol) into "Jenkins URI" (with protocol)
1 parent f19e8e7 commit 38d7329

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/applications/diffusion/JenkinsAPIRequest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public function query() {
9393
}
9494

9595
private function buildUrl() {
96-
$url = 'http://'.PhabricatorEnv::getEnvConfig('jenkins.host');
96+
$url = rtrim(PhabricatorEnv::getEnvConfig('jenkins.base-uri'), '/');
9797

9898
if ($this->jobName) {
9999
$url .= '/job/'.$this->jobName;

src/applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ public function getDescription() {
1313

1414
public function getOptions() {
1515
return array(
16-
$this->newOption('jenkins.host', 'string', null)
17-
->setDescription(pht('Jenkins installation hostname.')),
16+
$this->newOption('jenkins.base-uri', 'string', null)
17+
->setDescription(pht('URI where Jenkins is installed.'))
18+
->addExample('http://jenkins.example.com/', pht('Valid Setting')),
1819
$this->newOption('jenkins.user-id', 'string', null)
1920
->setDescription(pht('Username for accessing Jenkins.')),
2021
$this->newOption('jenkins.api-token', 'string', null)

src/applications/harbormaster/step/HarbormasterNotifyJenkinsBuildStepImplementation.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ protected function notifyGit() {
5858
}
5959

6060
protected function notifySVN() {
61-
$uri = 'https://'.PhabricatorEnv::getEnvConfig('jenkins.host');
61+
$uri = rtrim(PhabricatorEnv::getEnvConfig('jenkins.base-uri'), '/');
6262
$uri .= '/subversion/%s/notifyCommit?rev=%s';
6363

6464
$repository_uuid = PhabricatorEnv::getEnvConfig('jenkins.repository-uuid');

0 commit comments

Comments
 (0)