From d9a06dbe72672505ab028bdeeaab198341ec7283 Mon Sep 17 00:00:00 2001 From: anshul srivastava Date: Thu, 10 Nov 2016 14:51:55 +0530 Subject: [PATCH] fixed jenkins bot, fixed bots category --- server/app/lib/jenkins.js | 4 ---- server/app/routes/v1.0/routes_tasks.js | 3 +-- server/install.js | 4 ++-- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/server/app/lib/jenkins.js b/server/app/lib/jenkins.js index 62304f080..987601f79 100755 --- a/server/app/lib/jenkins.js +++ b/server/app/lib/jenkins.js @@ -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) { @@ -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); @@ -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); diff --git a/server/app/routes/v1.0/routes_tasks.js b/server/app/routes/v1.0/routes_tasks.js index 2ea675b8d..86891efcf 100755 --- a/server/app/routes/v1.0/routes_tasks.js +++ b/server/app/routes/v1.0/routes_tasks.js @@ -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."); diff --git a/server/install.js b/server/install.js index 358053331..760848cfd 100755 --- a/server/install.js +++ b/server/install.js @@ -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/',