@ministryofjustice/hmpps-probation-integration-e2e-tests 1.58.0 → 1.60.0
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/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ministryofjustice/hmpps-probation-integration-e2e-tests",
|
|
3
3
|
"description": "Playwright end to end tests for hmpps-probation-integration-services.",
|
|
4
|
-
"version": "1.
|
|
4
|
+
"version": "1.60.0",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://github.com/ministryofjustice/hmpps-probation-integration-e2e-tests#readme",
|
|
7
7
|
"bugs": {
|
package/steps/k8s/k8s-utils.d.ts
CHANGED
|
@@ -24,3 +24,9 @@ export declare function execCommand(namespace: string, podName: string, containe
|
|
|
24
24
|
* @param env
|
|
25
25
|
*/
|
|
26
26
|
export declare function runPod(namespace: string, podName: string, serviceAccountName?: string, args?: string[], env?: V1EnvVar[]): Promise<void>;
|
|
27
|
+
/**
|
|
28
|
+
* Run a cron job
|
|
29
|
+
* @param namespace
|
|
30
|
+
* @param cronJobName
|
|
31
|
+
*/
|
|
32
|
+
export declare function triggerCronJob(namespace: string, cronJobName: string): Promise<void>;
|
package/steps/k8s/k8s-utils.js
CHANGED
|
@@ -34,7 +34,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
34
34
|
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
|
-
import { CoreV1Api, Exec, KubeConfig } from '@kubernetes/client-node';
|
|
37
|
+
import { BatchV1Api, CoreV1Api, Exec, KubeConfig } from '@kubernetes/client-node';
|
|
38
|
+
import { DateTime } from 'luxon';
|
|
38
39
|
/**
|
|
39
40
|
* Get the name of the first pod in a deployment
|
|
40
41
|
* @param namespace
|
|
@@ -122,6 +123,7 @@ export function runPod(namespace_1, podName_1, serviceAccountName_1) {
|
|
|
122
123
|
namespace: namespace,
|
|
123
124
|
body: {
|
|
124
125
|
metadata: {
|
|
126
|
+
namespace: namespace,
|
|
125
127
|
name: podName,
|
|
126
128
|
},
|
|
127
129
|
spec: {
|
|
@@ -173,4 +175,66 @@ export function runPod(namespace_1, podName_1, serviceAccountName_1) {
|
|
|
173
175
|
});
|
|
174
176
|
});
|
|
175
177
|
}
|
|
178
|
+
/**
|
|
179
|
+
* Run a cron job
|
|
180
|
+
* @param namespace
|
|
181
|
+
* @param cronJobName
|
|
182
|
+
*/
|
|
183
|
+
export function triggerCronJob(namespace, cronJobName) {
|
|
184
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
185
|
+
var kubeConfig, batchClient, cronJob, jobName, job, started, status_1;
|
|
186
|
+
return __generator(this, function (_a) {
|
|
187
|
+
switch (_a.label) {
|
|
188
|
+
case 0:
|
|
189
|
+
kubeConfig = new KubeConfig();
|
|
190
|
+
kubeConfig.loadFromDefault();
|
|
191
|
+
batchClient = kubeConfig.makeApiClient(BatchV1Api);
|
|
192
|
+
return [4 /*yield*/, batchClient.readNamespacedCronJob({ name: cronJobName, namespace: namespace })];
|
|
193
|
+
case 1:
|
|
194
|
+
cronJob = _a.sent();
|
|
195
|
+
jobName = "".concat(cronJobName, "-manual-").concat(Math.random().toString(16).slice(2, 8));
|
|
196
|
+
return [4 /*yield*/, batchClient.createNamespacedJob({
|
|
197
|
+
body: {
|
|
198
|
+
metadata: {
|
|
199
|
+
namespace: namespace,
|
|
200
|
+
name: jobName,
|
|
201
|
+
ownerReferences: [
|
|
202
|
+
{
|
|
203
|
+
apiVersion: 'batch/v',
|
|
204
|
+
kind: 'CronJob',
|
|
205
|
+
name: cronJobName,
|
|
206
|
+
uid: cronJob.metadata.uid,
|
|
207
|
+
controller: true,
|
|
208
|
+
},
|
|
209
|
+
],
|
|
210
|
+
},
|
|
211
|
+
spec: cronJob.spec.jobTemplate.spec,
|
|
212
|
+
},
|
|
213
|
+
namespace: namespace,
|
|
214
|
+
})];
|
|
215
|
+
case 2:
|
|
216
|
+
job = _a.sent();
|
|
217
|
+
console.log('Job started:', job.metadata.name);
|
|
218
|
+
started = DateTime.now();
|
|
219
|
+
_a.label = 3;
|
|
220
|
+
case 3:
|
|
221
|
+
if (!(DateTime.now() < started.plus({ minutes: 5 }))) return [3 /*break*/, 6];
|
|
222
|
+
return [4 /*yield*/, batchClient.readNamespacedJob({ namespace: namespace, name: jobName })];
|
|
223
|
+
case 4:
|
|
224
|
+
status_1 = (_a.sent()).status;
|
|
225
|
+
if (status_1.succeeded)
|
|
226
|
+
return [3 /*break*/, 6];
|
|
227
|
+
if (status_1.failed)
|
|
228
|
+
throw new Error("Job ".concat(jobName, " failed"));
|
|
229
|
+
return [4 /*yield*/, new Promise(function (resolve) { return setTimeout(resolve, 5000); })];
|
|
230
|
+
case 5:
|
|
231
|
+
_a.sent();
|
|
232
|
+
return [3 /*break*/, 3];
|
|
233
|
+
case 6:
|
|
234
|
+
console.log('Job completed:', jobName);
|
|
235
|
+
return [2 /*return*/];
|
|
236
|
+
}
|
|
237
|
+
});
|
|
238
|
+
});
|
|
239
|
+
}
|
|
176
240
|
//# sourceMappingURL=k8s-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"k8s-utils.js","sourceRoot":"","sources":["../../../steps/k8s/k8s-utils.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAY,MAAM,yBAAyB,CAAA;
|
|
1
|
+
{"version":3,"file":"k8s-utils.js","sourceRoot":"","sources":["../../../steps/k8s/k8s-utils.ts"],"names":[],"mappings":"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"}
|