screwdriver-buildcluster-queue-worker 2.21.3 → 2.23.2
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.
- package/Dockerfile +1 -1
- package/config/custom-environment-variables.yaml +3 -0
- package/config/default.yaml +3 -0
- package/index.js +5 -2
- package/package.json +6 -10
- package/.npmignore +0 -7
package/Dockerfile
CHANGED
|
@@ -8,7 +8,7 @@ RUN mkdir -p /usr/src/app
|
|
|
8
8
|
WORKDIR /usr/src/app
|
|
9
9
|
|
|
10
10
|
# Install Screwdriver build cluster queue worker
|
|
11
|
-
RUN npm install screwdriver-buildcluster-queue-worker@$VERSION
|
|
11
|
+
RUN npm install screwdriver-buildcluster-queue-worker@$VERSION
|
|
12
12
|
WORKDIR /usr/src/app/node_modules/screwdriver-buildcluster-queue-worker
|
|
13
13
|
|
|
14
14
|
# Run the service
|
|
@@ -113,6 +113,7 @@ executor:
|
|
|
113
113
|
# in milliseconds
|
|
114
114
|
retryDelay: REQUEST_RETRYDELAY
|
|
115
115
|
maxAttempts: REQUEST_MAXATTEMPTS
|
|
116
|
+
sdHabEnabled: SD_HAB_ENABLED
|
|
116
117
|
k8s-sandbox:
|
|
117
118
|
pluginName: k8s
|
|
118
119
|
options:
|
|
@@ -207,6 +208,7 @@ executor:
|
|
|
207
208
|
# in milliseconds
|
|
208
209
|
retryDelay: REQUEST_RETRYDELAY
|
|
209
210
|
maxAttempts: REQUEST_MAXATTEMPTS
|
|
211
|
+
sdHabEnabled: SD_HAB_ENABLED
|
|
210
212
|
k8s-vm:
|
|
211
213
|
weightage: WEIGHT_K8S_VM
|
|
212
214
|
options:
|
|
@@ -280,6 +282,7 @@ executor:
|
|
|
280
282
|
# in milliseconds
|
|
281
283
|
retryDelay: REQUEST_RETRYDELAY
|
|
282
284
|
maxAttempts: REQUEST_MAXATTEMPTS
|
|
285
|
+
sdHabEnabled: SD_HAB_ENABLED
|
|
283
286
|
jenkins:
|
|
284
287
|
weightage: WEIGHT_JENKINS
|
|
285
288
|
options:
|
package/config/default.yaml
CHANGED
|
@@ -73,6 +73,7 @@ executor:
|
|
|
73
73
|
# in milliseconds
|
|
74
74
|
retryDelay: 3000
|
|
75
75
|
maxAttempts: 5
|
|
76
|
+
sdHabEnabled: true
|
|
76
77
|
k8s-sandbox:
|
|
77
78
|
pluginName: k8s
|
|
78
79
|
options:
|
|
@@ -135,6 +136,7 @@ executor:
|
|
|
135
136
|
# in milliseconds
|
|
136
137
|
retryDelay: 3000
|
|
137
138
|
maxAttempts: 5
|
|
139
|
+
sdHabEnabled: true
|
|
138
140
|
k8s-vm:
|
|
139
141
|
pluginName: k8s-vm
|
|
140
142
|
weightage: 0
|
|
@@ -188,6 +190,7 @@ executor:
|
|
|
188
190
|
# in milliseconds
|
|
189
191
|
retryDelay: 3000
|
|
190
192
|
maxAttempts: 5
|
|
193
|
+
sdHabEnabled: true
|
|
191
194
|
# jenkins:
|
|
192
195
|
# options:
|
|
193
196
|
# # Configuration of Jenkins
|
package/index.js
CHANGED
|
@@ -4,6 +4,9 @@ const conf = require('config');
|
|
|
4
4
|
const httpdConfig = conf.get('httpd'); // Setup HTTPd
|
|
5
5
|
const server = require('./lib/server');
|
|
6
6
|
const receiver = require('./receiver');
|
|
7
|
-
const connection = receiver.listen();
|
|
8
7
|
|
|
9
|
-
|
|
8
|
+
(async () => {
|
|
9
|
+
const connection = await receiver.listen();
|
|
10
|
+
|
|
11
|
+
server(httpdConfig, connection);
|
|
12
|
+
})();
|
package/package.json
CHANGED
|
@@ -1,17 +1,16 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "screwdriver-buildcluster-queue-worker",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.23.2",
|
|
4
4
|
"description": "An amqp connection manager implementation that consumes jobs from Rabbitmq queue.",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"pretest": "eslint .",
|
|
8
8
|
"test": "nyc --report-dir ./artifacts/coverage --reporter=lcov mocha --reporter mocha-multi-reporters --reporter-options configFile=./mocha.config.json --recursive --timeout 4000 --retries 1 --exit --allow-uncaught true --color true",
|
|
9
|
-
"start": "node index.js"
|
|
10
|
-
"semantic-release": "semantic-release pre && npm publish && semantic-release post"
|
|
9
|
+
"start": "node index.js"
|
|
11
10
|
},
|
|
12
11
|
"repository": {
|
|
13
12
|
"type": "git",
|
|
14
|
-
"url": "git
|
|
13
|
+
"url": "git+https://github.com/screwdriver-cd/buildcluster-queue-worker.git"
|
|
15
14
|
},
|
|
16
15
|
"homepage": "https://github.com/screwdriver-cd/buildcluster-queue-worker",
|
|
17
16
|
"bugs": "https://github.com/screwdriver-cd/screwdriver/issues",
|
|
@@ -50,7 +49,7 @@
|
|
|
50
49
|
"fs": "0.0.2",
|
|
51
50
|
"fs-extra": "^9.1.0",
|
|
52
51
|
"path": "^0.12.7",
|
|
53
|
-
"screwdriver-executor-k8s": "^14.
|
|
52
|
+
"screwdriver-executor-k8s": "^14.15.0",
|
|
54
53
|
"screwdriver-executor-k8s-vm": "^4.3.0",
|
|
55
54
|
"screwdriver-executor-router": "^2.3.0",
|
|
56
55
|
"screwdriver-logger": "^1.1.0",
|
|
@@ -58,9 +57,6 @@
|
|
|
58
57
|
"threads": "^0.12.1"
|
|
59
58
|
},
|
|
60
59
|
"release": {
|
|
61
|
-
"debug": false
|
|
62
|
-
"verifyConditions": {
|
|
63
|
-
"path": "./node_modules/semantic-release/src/lib/plugin-noop.js"
|
|
64
|
-
}
|
|
60
|
+
"debug": false
|
|
65
61
|
}
|
|
66
|
-
}
|
|
62
|
+
}
|