Skip to content

Scheduler is not working for Jenkins job(CAT-2534) #1012

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
Dec 5, 2016
Merged

Scheduler is not working for Jenkins job(CAT-2534) #1012

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
a5b0b70
Add Task Execution Standard Time in Task/History Schema
Durgesh1988 Dec 5, 2016
166e548
Merge remote-tracking branch 'upstream/dev' into dev
Durgesh1988 Dec 5, 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
29 changes: 3 additions & 26 deletions ...t/cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEvent.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,35 +42,15 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Task</
<option ng-repeat="repeatBy in repeatCount(30)" value="{{repeatBy}}" title="Repeat Every {{repeatBy}}">{{repeatBy}}</option>
</select>
</div>
<!--repeat on yearly for month starts -->
<!-- <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 margintop10" ng-show=" repeatsType==='Yearly'">
<label class="col-lg-3 col-md-3 col-sm-3 col-xs-3 text-padding control-label">Choose Month:
<span class="control-label red">&nbsp;*</span>
<span ng-show="newSchedule.selectedMonth.$touched && newSchedule.selectedMonth.$invalid" class="inputValidationMsg">required
</span>
</label>
<div class="col-lg-9 col-md-9 col-sm-9 col-xs-9">
<select id="selectedMonth" name="selectedMonth" class="ng-pristine ng-valid ng-touched" aria-invalid="false" ng-model="selectedMonth">
<option value="" selected="selected">Choose the Month</option>
<option ng-repeat="selectedMonth in monthOfYear" value="{{selectedMonth}}" title="Repeats every {{day}} {{repeatsType}}">{{selectedMonth}}</option>
</select>
</div>
</div> -->
<!--repeat on yearly for month ends-->
<!--starts at dropdown-->
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 margintop10" ng-show="checkFrequencyCheck">
<label>Time(Hrs):
<span class="red">&nbsp;*</span>
<span ng-show="newSchedule.timeEventHour.$touched && newSchedule.timeEventHour.$invalid" class="inputValidationMsg">required
</span>
</label>
<!-- <select name="timeEventHour" class="form-control-date" ng-model="timeEventType">
<option value="" selected="selected">Choose Start Hour</option>
<option ng-repeat="timeNumber in repeatCount(23)" value="{{timeNumber}}" title="Time Starts {{timeNumber}} {{repeatsType}}">{{timeNumber}}</option>
</select>-->
<select name="timeEventHour" class="form-control-date" ng-model="timeEventHour">
<option value="" selected="selected">Choose the Hour</option>
<option ng-repeat="timeEventHour in repeatHourCount(23)" value="{{timeEventHour}}" title="Repeat Every {{timeEventHour}}">{{timeEventHour}}</option>
<option ng-repeat="timeEventHour in repeatHourCount(23)" value="{{timeEventHour}}" >{{timeEventHour}}</option>
</select>
</div>
<div class="col-lg-6 col-md-6 col-sm-6 col-xs-6 margintop10" ng-show="checkFrequencyCheck">
Expand All @@ -79,13 +59,10 @@ <h4 class="modal-title"><i class="fa fa-calendar"></i>&nbsp;Schedule your Task</
<span ng-show="newSchedule.timeEventMinute.$touched && newSchedule.timeEventMinute.$invalid" class="inputValidationMsg">required
</span>
</label>
<!-- <select name="timeEventMinute" class="form-control-date" ng-model="timeEventMinute">
<option value="" selected="selected">Choose Start Minute</option>
<option ng-repeat="timeNumberMinutes in repeatCount(59)" value="{{timeNumberMinutes}}" title="Time Starts {{timeNumberMinutes}} {{repeatsType}}">{{timeNumberMinutes}}</option>
</select>-->

<select name="timeEventMinute" class="form-control-date" ng-model="timeEventMinute">
<option value="" selected="selected">Choose the Minute</option>
<option ng-repeat="timeEventMinute in repeatHourCount(59)" value="{{timeEventMinute}}" title="Repeat Every {{timeEventMinute}}">{{timeEventMinute}}</option>
<option ng-repeat="timeEventMinute in repeatHourCount(59)" value="{{timeEventMinute}}">{{timeEventMinute}}</option>
</select>
</div>
<!--repeat on weekly -->
Expand Down
12 changes: 6 additions & 6 deletions ...cat3/src/partials/sections/dashboard/workzone/orchestration/popups/addChefJobEventCtrl.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
}
$scope.repeatBy = items.chefJenkScriptTaskObj.repeatBy || items.chefJenkScriptTaskObj.cronRepeatEvery.toString();
$scope.repeatsType = items.chefJenkScriptTaskObj.repeats || items.chefJenkScriptTaskObj.cronFrequency;
$scope.timeEventHour = items.chefJenkScriptTaskObj.cronHour;
$scope.timeEventMinute = items.chefJenkScriptTaskObj.cronMinute;
$scope.weekOfTheDay = items.chefJenkScriptTaskObj.cronWeekDay;
$scope.currentDate = items.chefJenkScriptTaskObj.cronDate;
$scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.cronMonth;
$scope.selectedMonth = items.chefJenkScriptTaskObj.cronYear;
$scope.timeEventHour = items.chefJenkScriptTaskObj.timeEventHour || items.chefJenkScriptTaskObj.cronHour !==null? items.chefJenkScriptTaskObj.cronHour.toString() : '';
$scope.timeEventMinute = items.chefJenkScriptTaskObj.timeEventMinute || items.chefJenkScriptTaskObj.cronMinute !==null ? items.chefJenkScriptTaskObj.cronMinute.toString() : '';
$scope.weekOfTheDay = items.chefJenkScriptTaskObj.weekOfTheDay || items.chefJenkScriptTaskObj.cronWeekDay !==null ?items.chefJenkScriptTaskObj.cronWeekDay.toString(): '';
$scope.currentDate = items.chefJenkScriptTaskObj.currentDate || items.chefJenkScriptTaskObj.cronDate !==null ?items.chefJenkScriptTaskObj.cronDate.toString() : '';
$scope.selectedDayOfTheMonth = items.chefJenkScriptTaskObj.selectedDayOfTheMonth || items.chefJenkScriptTaskObj.cronMonth !==null ?items.chefJenkScriptTaskObj.cronMonth.toString() : '';
$scope.selectedMonth = items.chefJenkScriptTaskObj.selectedMonth || items.chefJenkScriptTaskObj.cronYear !==null ? items.chefJenkScriptTaskObj.cronYear.toString() : '';
if ($scope.repeatsType === 'Minutes' || $scope.repeatsType === 'Hourly') {
$scope.checkFrequencyCheck = false;
} else {
Expand Down
52 changes: 38 additions & 14 deletions server/app/services/taskService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,25 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic
task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId, auditTrailId, function (err, taskRes, historyData) {
if (err) {
if (auditTrailId !== null) {
var resultTaskExecution = {
"actionStatus": 'failed',
"status": "failed",
"endedOn": new Date().getTime(),
"actionLogId": historyData.nodeIdsWithActionLog[0].actionLogId,
"auditTrailConfig.nodeIdsWithActionLog": historyData.nodeIdsWithActionLog
};
var resultTaskExecution = null;
if(task.taskType === 'jenkins'){
resultTaskExecution = {
"actionStatus":'failed',
"status":'failed',
"endedOn":new Date().getTime(),
"actionLogId":historyData.jenkinsServerId,
"auditTrailConfig.jenkinsBuildNumber":historyData.buildNumber,
"auditTrailConfig.jenkinsJobName":historyData.jobName
};
}else{
resultTaskExecution = {
"actionStatus": 'failed',
"status": "failed",
"endedOn": new Date().getTime(),
"actionLogId": historyData.nodeIdsWithActionLog[0].actionLogId,
"auditTrailConfig.nodeIdsWithActionLog": historyData.nodeIdsWithActionLog
};
}
auditTrailService.updateAuditTrail('BOTs', auditTrailId, resultTaskExecution, function (err, auditTrail) {
if (err) {
logger.error("Failed to create or update bot Log: ", err);
Expand All @@ -216,13 +228,25 @@ taskService.executeTask = function executeTask(taskId, user, hostProtocol, choic
task.execute(user, hostProtocol, choiceParam, appData, blueprintIds, task.envId,auditTrailId,function(err, taskRes, historyData) {
if (err) {
if(auditTrailId !== null) {
var resultTaskExecution = {
"actionStatus": 'failed',
"status": "failed",
"endedOn": new Date().getTime(),
"actionLogId": historyData.nodeIdsWithActionLog[0].actionLogId,
"auditTrailConfig.nodeIdsWithActionLog": historyData.nodeIdsWithActionLog
};
var resultTaskExecution = null;
if(task.taskType === 'jenkins'){
resultTaskExecution = {
"actionStatus":'failed',
"status":'failed',
"endedOn":new Date().getTime(),
"actionLogId":historyData.jenkinsServerId,
"auditTrailConfig.jenkinsBuildNumber":historyData.buildNumber,
"auditTrailConfig.jenkinsJobName":historyData.jobName
};
}else{
resultTaskExecution = {
"actionStatus": 'failed',
"status": "failed",
"endedOn": new Date().getTime(),
"actionLogId": historyData.nodeIdsWithActionLog[0].actionLogId,
"auditTrailConfig.nodeIdsWithActionLog": historyData.nodeIdsWithActionLog
};
}
auditTrailService.updateAuditTrail('BOTs', auditTrailId, resultTaskExecution, function (err, auditTrail) {
if (err) {
logger.error("Failed to create or update bot Log: ", err);
Expand Down