screwdriver-queue-service 2.0.39 → 2.0.40

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/plugins/queue/scheduler.js +23 -25
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "screwdriver-queue-service",
3
- "version": "2.0.39",
3
+ "version": "2.0.40",
4
4
  "description": "Screwdriver Queue Service API",
5
5
  "main": "app.js",
6
6
  "directories": {
package/plugins/queue/scheduler.js CHANGED
@@ -42,32 +42,32 @@ async function postBuildEvent(executor, eventConfig) {
42
42
 
43
43
  const admin = await helper.getPipelineAdmin(token, apiUri, pipelineId, helper.requestRetryStrategy);
44
44
 
45
- if (admin) {
46
- logger.info(
47
- `POST event for pipeline ${pipelineId}:${job.name}:${job.id}:${buildId} using user ${admin.username}`
48
- );
45
+ logger.info(
46
+ `POST event for pipeline ${pipelineId}:${job.name}:${job.id}:${buildId} using user ${admin.username}`
47
+ );
49
48
 
50
- const jwt = executor.userTokenGen(admin.username, {}, admin.scmContext);
49
+ const jwt = executor.userTokenGen(admin.username, {}, admin.scmContext);
51
50
 
52
- const buildEvent = {
53
- pipelineId,
54
- startFrom: job.name,
55
- creator: {
56
- name: 'Screwdriver scheduler',
57
- username: 'sd:scheduler'
58
- },
59
- causeMessage: causeMessage || 'Automatically started by scheduler'
60
- };
51
+ const buildEvent = {
52
+ pipelineId,
53
+ startFrom: job.name,
54
+ creator: {
55
+ name: 'Screwdriver scheduler',
56
+ username: 'sd:scheduler'
57
+ },
58
+ causeMessage: causeMessage || 'Automatically started by scheduler'
59
+ };
61
60
 
62
- if (eventId) {
63
- buildEvent.parentEventId = eventId;
64
- }
65
- if (buildId) {
66
- buildEvent.buildId = buildId;
67
- }
61
+ if (eventId) {
62
+ buildEvent.parentEventId = eventId;
63
+ }
64
+ if (buildId) {
65
+ buildEvent.buildId = buildId;
66
+ }
68
67
 
69
- await helper.createBuildEvent(apiUri, jwt, buildEvent, helper.requestRetryStrategyPostEvent);
70
- } else {
68
+ await helper.createBuildEvent(apiUri, jwt, buildEvent, helper.requestRetryStrategyPostEvent);
69
+ } catch (err) {
70
+ if (err.statusCode === 404) {
71
71
  logger.error(
72
72
  `POST event for pipeline failed as no admin found: ${pipelineId}:${job.name}:${job.id}:${buildId}`
73
73
  );
@@ -91,10 +91,8 @@ async function postBuildEvent(executor, eventConfig) {
91
91
  },
92
92
  helper.requestRetryStrategyPostEvent
93
93
  );
94
-
95
- throw new Error(`Pipeline admin not found, cannot process build ${buildId}`);
96
94
  }
97
- } catch (err) {
95
+
98
96
  logger.error(`Error in post build event function ${buildId} ${err}`);
99
97
  throw err;
100
98
  }