Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
JENKINS-13726: Support for GitHub Enterprise.
- Loading branch information
Showing
7 changed files
with
33 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 7 additions & 1 deletion
8
src/main/resources/com/cloudbees/jenkins/Credential/config.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,15 @@ | ||
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> | ||
<f:entry title="${%API URL}" field="apiUrl"> | ||
<f:textbox/> | ||
</f:entry> | ||
<f:entry title="${%Username}" field="username"> | ||
<f:textbox/> | ||
</f:entry> | ||
<f:entry title="${%Password}" field="password"> | ||
<f:password/> | ||
</f:entry> | ||
<f:validateButton title="${%Test Credential}" with="username,password,apiToken" method="validate"/> | ||
<f:entry title="${%API key}" field="apiToken"> | ||
<f:textbox/> | ||
</f:entry> | ||
<f:validateButton title="${%Test Credential}" with="apiUrl,username,password,apiToken" method="validate"/> | ||
</j:jelly> |
3 changes: 3 additions & 0 deletions
3
src/main/resources/com/cloudbees/jenkins/Credential/help-apiUrl.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<div> | ||
If you use GitHub Enterprise you may specify the API end point here eg. "https://ghe.acme.com/api/v3", the API key is required and password is ignored. | ||
</div> |
3 changes: 3 additions & 0 deletions
3
src/main/resources/com/cloudbees/jenkins/Credential/help-password.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<div> | ||
Password is no longer required if you specify the API key. | ||
</div> |
2 changes: 0 additions & 2 deletions
2
src/main/resources/com/cloudbees/jenkins/Credential/help-username.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,3 @@ | ||
<div> | ||
Credentials used to access GitHub to install/remove hooks. Because GitHub doesn't have an API for managing | ||
hooks, we also need to ask you to provide password, in addition to the API key. | ||
If your Jenkins uses multiple repositories that spread across different user accounts, you can list them all here. | ||
</div> |
passing the api token here appears to be incorrect. The connectToEnterprise method is expecting a password and not a token. The end result being that to connect to a Github enterprise instance you have to place your password as cleartext in the token field when configuring jenkins for the plugin to work correctly. I have verified this behavior using the latest jenkins, github plugin, and github api versions.
Mark Klunder