Skip to content

Jenkins Job Issue #961

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 2 commits into from
Nov 23, 2016
Merged

Jenkins Job Issue #961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31fc741
Jenkins Job Issue
Durgesh1988 Nov 22, 2016
968d99a
Jenkins Job Logs Implementation
Durgesh1988 Nov 22, 2016
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
7 changes: 7 additions & 0 deletions server/app/model/audit-trail/bot-audit-trail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,13 @@ var BotAuditTrailSchema = new BaseAuditTrail({
type: String,
trim:true
},
jenkinsBuildNumber:{
type: Number
},
jenkinsJobName:{
type: String,
trim:true
},
nodeIdsWithActionLog:[Schema.Types.Mixed]
}
});
Expand Down
4 changes: 0 additions & 4 deletions server/app/model/classes/tasks/taskTypeJenkins.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,10 +315,6 @@ jenkinsTaskSchema.methods.execute = function(userName, baseUrl, choiceParam, nex
});
}
pollBuildStarted();




});
}
} else {
Expand Down
28 changes: 20 additions & 8 deletions server/app/model/classes/tasks/tasks.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,25 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b
if (taskHistory) {
taskHistory.timestampEnded = self.timestampEnded;
taskHistory.status = self.lastTaskStatus;
var resultTaskExecution = {
"actionStatus":self.lastTaskStatus,
"status":self.lastTaskStatus,
"endedOn":self.timestampEnded,
"actionLogId":taskHistory.nodeIdsWithActionLog[0].actionLogId,
"auditTrailConfig.nodeIdsWithActionLog":taskHistory.nodeIdsWithActionLog
};
var resultTaskExecution = null;
if(taskHistoryData.taskType === TASK_TYPE.JENKINS_TASK){
resultTaskExecution = {
"actionStatus":self.lastTaskStatus,
"status":self.lastTaskStatus,
"endedOn":self.timestampEnded,
"actionLogId":taskHistory.jenkinsServerId,
"auditTrailConfig.jenkinsBuildNumber":taskHistory.buildNumber,
"auditTrailConfig.jenkinsJobName":taskHistory.jobName
};
}else{
resultTaskExecution = {
"actionStatus":self.lastTaskStatus,
"status":self.lastTaskStatus,
"endedOn":self.timestampEnded,
"actionLogId":taskHistory.nodeIdsWithActionLog[0].actionLogId,
"auditTrailConfig.nodeIdsWithActionLog":taskHistory.nodeIdsWithActionLog
};
}
if (resultData) {
if (resultData.instancesResults && resultData.instancesResults.length) {
taskHistory.executionResults = resultData.instancesResults;
Expand All @@ -314,7 +326,7 @@ taskSchema.methods.execute = function(userName, baseUrl, choiceParam, appData, b
}

}
if(auditTrailId !== null){
if(auditTrailId !== null && resultTaskExecution !== null){
auditTrailService.updateAuditTrail('BOTs',auditTrailId,resultTaskExecution,function(err,auditTrail){
if (err) {
logger.error("Failed to create or update bot Log: ", err);
Expand Down
20 changes: 15 additions & 5 deletions server/app/services/auditTrailService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,15 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){
callback(null,data.length);
});

},
totalNoOfRunningBots: function(callback){
auditTrail.getAuditTrailByStatus('BOTs','running',function(err,data){
if(err){
callback(err,null);
}
callback(null,data.length);
});

},
totalSavedTimeForBots: function(callback){
auditTrail.getAuditTrailByType('BOTs',function(err,botAuditTrail){
Expand All @@ -214,9 +223,10 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){
for(var i = 0; i < botAuditTrail.length; i++){
(function(auditTrail){
count++;
var executionTime = getExecutionTime(auditTrail.endedOn,auditTrail.startedOn);
var savedTime = 600-executionTime;
totalTimeInSeconds = totalTimeInSeconds+savedTime;
if(auditTrail.endedOn && auditTrail.endedOn !== null) {
var executionTime = getExecutionTime(auditTrail.endedOn, auditTrail.startedOn);
totalTimeInSeconds = totalTimeInSeconds + (600 - executionTime);
}
})(botAuditTrail[i]);
}
if(count === botAuditTrail.length){
Expand Down Expand Up @@ -251,7 +261,7 @@ auditTrailService.getBOTsSummary = function getBOTsSummary(callback){

function getExecutionTime(endTime,startTime){
var executionTimeInMS = endTime-startTime;
var executionTime = executionTimeInMS/(1000);
return executionTime;
var totalSeconds = Math.floor(executionTimeInMS/1000);
return totalSeconds;
}