Merge remote-tracking branch 'yannickgit/http-auth-on-jenkins'
This commit is contained in:
commit
6ab2829dfc
14
server.js
14
server.js
|
@ -3280,6 +3280,13 @@ cache(function(data, match, sendBadge, request) {
|
||||||
uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color'
|
uri: scheme + '://' + host + '/job/' + job + '/api/json?tree=color'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (serverSecrets && serverSecrets.jenkins_user) {
|
||||||
|
options.auth = {
|
||||||
|
user: serverSecrets.jenkins_user,
|
||||||
|
pass: serverSecrets.jenkins_pass
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
var badgeData = getBadgeData('build', data);
|
var badgeData = getBadgeData('build', data);
|
||||||
request(options, function(err, res, json) {
|
request(options, function(err, res, json) {
|
||||||
if (err !== null) {
|
if (err !== null) {
|
||||||
|
@ -3327,6 +3334,13 @@ cache(function(data, match, sendBadge, request) {
|
||||||
+ '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]'
|
+ '/lastBuild/api/json?tree=actions[failCount,skipCount,totalCount]'
|
||||||
};
|
};
|
||||||
|
|
||||||
|
if (serverSecrets && serverSecrets.jenkins_user) {
|
||||||
|
options.auth = {
|
||||||
|
user: serverSecrets.jenkins_user,
|
||||||
|
pass: serverSecrets.jenkins_pass
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
var badgeData = getBadgeData('tests', data);
|
var badgeData = getBadgeData('tests', data);
|
||||||
request(options, function(err, res, json) {
|
request(options, function(err, res, json) {
|
||||||
if (err !== null) {
|
if (err !== null) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user