Merge remote-tracking branch 'yannickgit/http-auth-on-jenkins'

This commit is contained in:
Thaddee Tyl 2015-12-13 22:36:52 +01:00
commit 6ab2829dfc

View File

@ -3280,6 +3280,13 @@ cache(function(data, match, sendBadge, request) {
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);
request(options, function(err, res, json) {
if (err !== null) {
@ -3327,6 +3334,13 @@ cache(function(data, match, sendBadge, request) {
+ '/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);
request(options, function(err, res, json) {
if (err !== null) {