Skip to content

Fixed Bot Category & Jenkins Bot #890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 10, 2016
Merged

Fixed Bot Category & Jenkins Bot #890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions server/app/lib/jenkins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ var Jenkins = function(options) {
}

jenkinsUrl += parsedUrl.host + parsedUrl.path;
logger.debug(jenkinsUrl);
var jenkins = jenkinsApi.init(jenkinsUrl);

this.getJobs = function(callback) {
Expand Down Expand Up @@ -102,7 +101,6 @@ var Jenkins = function(options) {
};

this.getLastBuildInfo = function(jobName, callback) {
logger.debug(jobName);
jenkins.last_build_info(jobName, function(err, data) {
if (err) {
logger.error(err, data);
Expand Down Expand Up @@ -160,14 +158,12 @@ var Jenkins = function(options) {

};
this.getDepthJobInfo = function(jobName, callback) {
logger.debug("parsedUrl: ", parsedUrl.href);
var options_auth = {
user: options.username,
password: options.password
};
client = new Client(options_auth);
var jenkinsUrl1 = parsedUrl.href + 'job/' + jobName + '/api/json?depth=1';
logger.debug('jenkinsUrl', jenkinsUrl1);
client.registerMethod("jsonMethod", jenkinsUrl1, "GET");
client.methods.jsonMethod(function(data, response) {
callback(null, data);
Expand Down
3 changes: 1 addition & 2 deletions server/app/routes/v1.0/routes_tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,7 @@ module.exports.setRoutes = function(app, sessionVerification) {
}





taskService.executeTask(taskId, user, hostProtocol, choiceParam, appData, paramOptions, botTagServer, function(err, historyData) {
if (err === 404) {
res.status(404).send("Task not found.");
Expand Down
4 changes: 2 additions & 2 deletions server/install.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,8 @@ function getDefaultsConfig() {
}
},
taggingServerList: ['Sensu Server','LDAP Server','AD Server'],
botTypeList: ['Task','Check','Learning', 'Composite','Built with other'],
categoryList: ['Active Directory','Amazon Web Services','VMWare', 'Windows Services', 'Acitve Directory Workflow', 'OpenDJ LDAP Workflow', 'Application Deployment', 'Installation & Configuration', 'Database Management', 'Upgrade', 'Installation'],
botTypeList: ['Task','Check','Learning', 'Composite','Built with other','Run','UI'],
categoryList: ['Active Directory', 'OpenDJ LDAP','Monitoring', 'Application Deployment', 'Service Management', 'Database Management', 'Upgrade', 'Installation'],
aws: {
pemFileLocation: __dirname + '/app/config/',
s3BucketDownloadFileLocation: currentDirectory + '/catdata/catalyst/temp/',
Expand Down