@datadog/datadog-ci 2.31.0 → 2.31.1
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/dist/commands/junit/api.js +4 -4
- package/dist/commands/junit/api.js.map +1 -1
- package/dist/commands/junit/interfaces.d.ts +2 -2
- package/dist/commands/junit/renderer.d.ts +0 -1
- package/dist/commands/junit/renderer.js +1 -5
- package/dist/commands/junit/renderer.js.map +1 -1
- package/dist/commands/junit/upload.d.ts +2 -4
- package/dist/commands/junit/upload.js +14 -32
- package/dist/commands/junit/upload.js.map +1 -1
- package/package.json +1 -1
|
@@ -34,15 +34,15 @@ const uploadJUnitXML = (request) => (jUnitXML) => __awaiter(void 0, void 0, void
|
|
|
34
34
|
catch (e) {
|
|
35
35
|
fileName = 'default_file_name';
|
|
36
36
|
}
|
|
37
|
-
const
|
|
37
|
+
const reportTagsAndMetrics = {
|
|
38
38
|
tags: jUnitXML.reportTags,
|
|
39
|
-
|
|
39
|
+
metrics: jUnitXML.reportMetrics,
|
|
40
40
|
};
|
|
41
41
|
const custom = {
|
|
42
42
|
metadata: jUnitXML.spanTags,
|
|
43
43
|
tags: jUnitXML.customTags,
|
|
44
|
-
metrics: jUnitXML.
|
|
45
|
-
session:
|
|
44
|
+
metrics: jUnitXML.customMetrics,
|
|
45
|
+
session: reportTagsAndMetrics,
|
|
46
46
|
'_dd.cireport_version': '3',
|
|
47
47
|
'_dd.hostname': jUnitXML.hostname,
|
|
48
48
|
'_dd.report_name': fileName,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,+BAA+B;AAI/B,0DAAgC;AAChC,+BAAiC;AAEjC,+CAAqD;AAIrD,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEjB,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;AAChF,QAAA,SAAS,GAAG,2BAA2B,mBAAW,EAAE,CAAA;AACpD,QAAA,MAAM,GAAG,eAAe,mBAAW,EAAE,CAAA;AAE3C,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAE3B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/commands/junit/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,+BAA+B;AAI/B,0DAAgC;AAChC,+BAAiC;AAEjC,+CAAqD;AAIrD,sLAAsL;AACtL,iHAAiH;AACjH,MAAM,aAAa,GAAG,QAAQ,CAAA;AAEjB,QAAA,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,eAAe,CAAA;AAChF,QAAA,SAAS,GAAG,2BAA2B,mBAAW,EAAE,CAAA;AACpD,QAAA,MAAM,GAAG,eAAe,mBAAW,EAAE,CAAA;AAE3C,MAAM,cAAc,GAAG,CAAC,OAAkE,EAAE,EAAE,CAAC,CACpG,QAAiB,EACjB,EAAE;IACF,MAAM,IAAI,GAAG,IAAI,mBAAQ,EAAE,CAAA;IAE3B,IAAI,QAAQ,CAAA;IACZ,IAAI;QACF,QAAQ,GAAG,cAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAA;KAC7C;IAAC,OAAO,CAAC,EAAE;QACV,QAAQ,GAAG,mBAAmB,CAAA;KAC/B;IAED,MAAM,oBAAoB,GAAwB;QAChD,IAAI,EAAE,QAAQ,CAAC,UAAU;QACzB,OAAO,EAAE,QAAQ,CAAC,aAAa;KAChC,CAAA;IAED,MAAM,MAAM,GAAwB;QAClC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,IAAI,EAAE,QAAQ,CAAC,UAAU;QACzB,OAAO,EAAE,QAAQ,CAAC,aAAa;QAC/B,OAAO,EAAE,oBAAoB;QAC7B,sBAAsB,EAAE,GAAG;QAC3B,cAAc,EAAE,QAAQ,CAAC,QAAQ;QACjC,iBAAiB,EAAE,QAAQ;KAC5B,CAAA;IAED,IAAI,QAAQ,CAAC,WAAW,EAAE;QACxB,MAAM,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAA;KACnC;IAED,IAAI,QAAQ,CAAC,SAAS,EAAE;QACtB,MAAM,CAAC,yBAAyB,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAA;KACvD;IAED,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,EAAC,QAAQ,EAAE,YAAY,EAAC,CAAC,CAAA;IAEtE,IAAI,CAAC,MAAM,CAAC,uBAAuB,EAAE,YAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAA,iBAAU,GAAE,CAAC,EAAE;QAC7F,QAAQ,EAAE,GAAG,IAAA,SAAM,GAAE,SAAS;KAC/B,CAAC,CAAA;IAEF,OAAO,OAAO,CAAC;QACb,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;QAC1B,aAAa;QACb,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,iBAAiB;KACvB,CAAC,CAAA;AACJ,CAAC,CAAA,CAAA;AAhDY,QAAA,cAAc,kBAgD1B;AAEM,MAAM,cAAc,GAAG,CAAC,aAAqB,EAAE,MAAc,EAAE,EAAE;IACtE,MAAM,aAAa,GAAG,IAAA,yBAAiB,EAAC,EAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAC,CAAC,CAAA;IAEzE,OAAO;QACL,cAAc,EAAE,IAAA,sBAAc,EAAC,aAAa,CAAC;KAC9C,CAAA;AACH,CAAC,CAAA;AANY,QAAA,cAAc,kBAM1B"}
|
|
@@ -5,9 +5,9 @@ export interface Payload {
|
|
|
5
5
|
logsEnabled: boolean;
|
|
6
6
|
spanTags: SpanTags;
|
|
7
7
|
customTags: Record<string, string>;
|
|
8
|
-
|
|
8
|
+
customMetrics: Record<string, number>;
|
|
9
9
|
reportTags: Record<string, string>;
|
|
10
|
-
|
|
10
|
+
reportMetrics: Record<string, number>;
|
|
11
11
|
xmlPath: string;
|
|
12
12
|
xpathTags?: Record<string, string>;
|
|
13
13
|
}
|
|
@@ -4,7 +4,6 @@ export declare const renderInvalidFile: (xmlPath: string, errorMessage: string)
|
|
|
4
4
|
export declare const renderFailedUpload: (payload: Payload, errorMessage: string) => string;
|
|
5
5
|
export declare const renderFailedGitDBSync: (err: any) => string;
|
|
6
6
|
export declare const renderRetriedUpload: (payload: Payload, errorMessage: string, attempt: number) => string;
|
|
7
|
-
export declare const renderDeprecatedMention: (deprecatedMention: string, newMention: string, deprecatedType: string) => string;
|
|
8
7
|
export declare const renderSuccessfulUpload: (dryRun: boolean, fileCount: number, duration: number) => string;
|
|
9
8
|
export declare const renderSuccessfulGitDBSync: (dryRun: boolean, elapsed: number) => string;
|
|
10
9
|
export declare const renderSuccessfulCommand: (spanTags: SpanTags, service: string, env?: string) => string;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderSuccessfulGitDBSync = exports.renderSuccessfulUpload = exports.
|
|
6
|
+
exports.renderCommandInfo = exports.renderUpload = exports.renderDryRunUpload = exports.renderSuccessfulCommand = exports.renderSuccessfulGitDBSync = exports.renderSuccessfulUpload = exports.renderRetriedUpload = exports.renderFailedGitDBSync = exports.renderFailedUpload = exports.renderInvalidFile = void 0;
|
|
7
7
|
const path_1 = __importDefault(require("path"));
|
|
8
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
9
9
|
const utils_1 = require("./utils");
|
|
@@ -31,10 +31,6 @@ const renderRetriedUpload = (payload, errorMessage, attempt) => {
|
|
|
31
31
|
return chalk_1.default.yellow(`[attempt ${attempt}] Retrying jUnitXML upload ${jUnitXMLPath}: ${errorMessage}\n`);
|
|
32
32
|
};
|
|
33
33
|
exports.renderRetriedUpload = renderRetriedUpload;
|
|
34
|
-
const renderDeprecatedMention = (deprecatedMention, newMention, deprecatedType) => {
|
|
35
|
-
return chalk_1.default.yellow(`${ICONS.WARNING} The "${deprecatedMention}" ${deprecatedType} is deprecated. Please use the "${newMention}" ${deprecatedType} instead.\n`);
|
|
36
|
-
};
|
|
37
|
-
exports.renderDeprecatedMention = renderDeprecatedMention;
|
|
38
34
|
const renderSuccessfulUpload = (dryRun, fileCount, duration) => {
|
|
39
35
|
return chalk_1.default.green(`${dryRun ? '[DRYRUN] ' : ''}${ICONS.SUCCESS} Uploaded ${fileCount} files in ${duration} seconds.`);
|
|
40
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/junit/renderer.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,kDAAyB;AAKzB,mCAAgE;AAEhE,MAAM,KAAK,GAAG;IACZ,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,GAAG;IACZ,OAAO,EAAE,IAAI;CACd,CAAA;AAEM,MAAM,iBAAiB,GAAG,CAAC,OAAe,EAAE,YAAoB,EAAE,EAAE;IACzE,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAA;IAEnD,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,0BAA0B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AAC9F,CAAC,CAAA;AAJY,QAAA,iBAAiB,qBAI7B;AAEM,MAAM,kBAAkB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,EAAE;IAC3E,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAA;IAE3D,OAAO,eAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,+BAA+B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AACnG,CAAC,CAAA;AAJY,QAAA,kBAAkB,sBAI9B;AAEM,MAAM,qBAAqB,GAAG,CAAC,GAAQ,EAAE,EAAE;IAChD,OAAO,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,MAAM,iCAAiC,GAAG,IAAI,CAAC,CAAA;AAChF,CAAC,CAAA;AAFY,QAAA,qBAAqB,yBAEjC;AAEM,MAAM,mBAAmB,GAAG,CAAC,OAAgB,EAAE,YAAoB,EAAE,OAAe,EAAE,EAAE;IAC7F,MAAM,YAAY,GAAG,IAAI,eAAK,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAA;IAE3D,OAAO,eAAK,CAAC,MAAM,CAAC,YAAY,OAAO,8BAA8B,YAAY,KAAK,YAAY,IAAI,CAAC,CAAA;AACzG,CAAC,CAAA;AAJY,QAAA,mBAAmB,uBAI/B;AAEM,MAAM,
|
|
1
|
+
{"version":3,"file":"renderer.js","sourceRoot":"","sources":["../../../src/commands/junit/renderer.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,12 +9,10 @@ export declare class UploadJUnitXMLCommand extends Command {
|
|
|
9
9
|
private logs;
|
|
10
10
|
private maxConcurrency;
|
|
11
11
|
private metrics;
|
|
12
|
-
private measures;
|
|
13
12
|
private service;
|
|
14
13
|
private tags;
|
|
15
14
|
private reportTags;
|
|
16
15
|
private reportMetrics;
|
|
17
|
-
private reportMeasures;
|
|
18
16
|
private rawXPathTags;
|
|
19
17
|
private gitRepositoryURL;
|
|
20
18
|
private skipGitMetadataUpload;
|
|
@@ -28,8 +26,8 @@ export declare class UploadJUnitXMLCommand extends Command {
|
|
|
28
26
|
private getMatchingJUnitXMLFiles;
|
|
29
27
|
private getSpanTags;
|
|
30
28
|
private getCustomTags;
|
|
31
|
-
private
|
|
29
|
+
private getCustomMetrics;
|
|
32
30
|
private getReportTags;
|
|
33
|
-
private
|
|
31
|
+
private getReportMetrics;
|
|
34
32
|
private uploadJUnitXML;
|
|
35
33
|
}
|
|
@@ -92,13 +92,11 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
92
92
|
validator: t.isBoolean(),
|
|
93
93
|
});
|
|
94
94
|
this.maxConcurrency = clipanion_1.Option.String('--max-concurrency', '20', { validator: validation.isInteger() });
|
|
95
|
-
this.metrics = clipanion_1.Option.Array('--metrics'
|
|
96
|
-
this.measures = clipanion_1.Option.Array('--measures');
|
|
95
|
+
this.metrics = clipanion_1.Option.Array('--metrics');
|
|
97
96
|
this.service = clipanion_1.Option.String('--service', { env: 'DD_SERVICE' });
|
|
98
97
|
this.tags = clipanion_1.Option.Array('--tags');
|
|
99
98
|
this.reportTags = clipanion_1.Option.Array('--report-tags');
|
|
100
|
-
this.reportMetrics = clipanion_1.Option.Array('--report-metrics'
|
|
101
|
-
this.reportMeasures = clipanion_1.Option.Array('--report-measures');
|
|
99
|
+
this.reportMetrics = clipanion_1.Option.Array('--report-metrics');
|
|
102
100
|
this.rawXPathTags = clipanion_1.Option.Array('--xpath-tag');
|
|
103
101
|
this.gitRepositoryURL = clipanion_1.Option.String('--git-repository-url');
|
|
104
102
|
this.skipGitMetadataUpload = clipanion_1.Option.String('--skip-git-metadata-upload', 'true', { validator: t.isBoolean() });
|
|
@@ -107,7 +105,6 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
107
105
|
env: process.env.DD_ENV,
|
|
108
106
|
envVarTags: process.env.DD_TAGS,
|
|
109
107
|
envVarMetrics: process.env.DD_METRICS,
|
|
110
|
-
envVarMeasures: process.env.DD_MEASURES,
|
|
111
108
|
};
|
|
112
109
|
this.logger = new logger_1.Logger((s) => this.context.stdout.write(s), logger_1.LogLevel.INFO);
|
|
113
110
|
}
|
|
@@ -139,10 +136,10 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
139
136
|
this.logger.info((0, renderer_1.renderCommandInfo)(this.basePaths, this.service, this.maxConcurrency, this.dryRun));
|
|
140
137
|
const spanTags = yield this.getSpanTags();
|
|
141
138
|
const customTags = this.getCustomTags();
|
|
142
|
-
const
|
|
139
|
+
const customMetrics = this.getCustomMetrics();
|
|
143
140
|
const reportTags = this.getReportTags();
|
|
144
|
-
const
|
|
145
|
-
const payloads = yield this.getMatchingJUnitXMLFiles(spanTags, customTags,
|
|
141
|
+
const reportMetrics = this.getReportMetrics();
|
|
142
|
+
const payloads = yield this.getMatchingJUnitXMLFiles(spanTags, customTags, customMetrics, reportTags, reportMetrics);
|
|
146
143
|
const upload = (p) => this.uploadJUnitXML(api, p);
|
|
147
144
|
const initialTime = new Date().getTime();
|
|
148
145
|
yield (0, concurrency_1.doWithMaxConcurrency)(this.maxConcurrency, payloads, upload);
|
|
@@ -208,7 +205,7 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
208
205
|
return xpathTags;
|
|
209
206
|
}, {});
|
|
210
207
|
}
|
|
211
|
-
getMatchingJUnitXMLFiles(spanTags, customTags,
|
|
208
|
+
getMatchingJUnitXMLFiles(spanTags, customTags, customMetrics, reportTags, reportMetrics) {
|
|
212
209
|
return __awaiter(this, void 0, void 0, function* () {
|
|
213
210
|
const jUnitXMLFiles = (this.basePaths || [])
|
|
214
211
|
.reduce((acc, basePath) => {
|
|
@@ -232,9 +229,9 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
232
229
|
xpathTags: this.xpathTags,
|
|
233
230
|
spanTags,
|
|
234
231
|
customTags,
|
|
235
|
-
|
|
232
|
+
customMetrics,
|
|
236
233
|
reportTags,
|
|
237
|
-
|
|
234
|
+
reportMetrics,
|
|
238
235
|
xmlPath: jUnitXMLFilePath,
|
|
239
236
|
}));
|
|
240
237
|
});
|
|
@@ -252,31 +249,16 @@ class UploadJUnitXMLCommand extends clipanion_1.Command {
|
|
|
252
249
|
const cliTags = this.tags ? (0, tags_1.parseTags)(this.tags) : {};
|
|
253
250
|
return Object.assign(Object.assign({}, cliTags), envVarTags);
|
|
254
251
|
}
|
|
255
|
-
|
|
252
|
+
getCustomMetrics() {
|
|
256
253
|
const envVarMetrics = this.config.envVarMetrics ? (0, tags_1.parseMetrics)(this.config.envVarMetrics.split(',')) : {};
|
|
257
|
-
const envVarMeasures = this.config.envVarMeasures ? (0, tags_1.parseMetrics)(this.config.envVarMeasures.split(',')) : {};
|
|
258
254
|
const cliMetrics = this.metrics ? (0, tags_1.parseMetrics)(this.metrics) : {};
|
|
259
|
-
|
|
260
|
-
// We have renamed "metrics" to "measures", but we will still support the old names for now.
|
|
261
|
-
if (this.metrics) {
|
|
262
|
-
this.context.stdout.write((0, renderer_1.renderDeprecatedMention)('--metrics', '--measures', 'option'));
|
|
263
|
-
}
|
|
264
|
-
if (this.config.envVarMetrics) {
|
|
265
|
-
this.context.stdout.write((0, renderer_1.renderDeprecatedMention)('DD_METRICS', 'DD_MEASURES', 'environment variable'));
|
|
266
|
-
}
|
|
267
|
-
return Object.assign(Object.assign(Object.assign(Object.assign({}, cliMetrics), cliMeasures), envVarMetrics), envVarMeasures);
|
|
255
|
+
return Object.assign(Object.assign({}, cliMetrics), envVarMetrics);
|
|
268
256
|
}
|
|
269
257
|
getReportTags() {
|
|
270
258
|
return this.reportTags ? (0, tags_1.parseTags)(this.reportTags) : {};
|
|
271
259
|
}
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
const cliMeasures = this.reportMeasures ? (0, tags_1.parseMetrics)(this.reportMeasures) : {};
|
|
275
|
-
// We have renamed "metrics" to "measures", but we will still support the old names for now.
|
|
276
|
-
if (this.reportMetrics) {
|
|
277
|
-
this.context.stdout.write((0, renderer_1.renderDeprecatedMention)('--report-metrics', '--report-measures', 'option'));
|
|
278
|
-
}
|
|
279
|
-
return Object.assign(Object.assign({}, cliMetrics), cliMeasures);
|
|
260
|
+
getReportMetrics() {
|
|
261
|
+
return this.reportMetrics ? (0, tags_1.parseMetrics)(this.reportMetrics) : {};
|
|
280
262
|
}
|
|
281
263
|
uploadJUnitXML(api, jUnitXML) {
|
|
282
264
|
return __awaiter(this, void 0, void 0, function* () {
|
|
@@ -327,8 +309,8 @@ UploadJUnitXMLCommand.usage = clipanion_1.Command.Usage({
|
|
|
327
309
|
'datadog-ci junit upload --service my-service --tags key1:value1 --tags key2:value2 .',
|
|
328
310
|
],
|
|
329
311
|
[
|
|
330
|
-
'Upload all jUnit XML test report files in current directory and add extra
|
|
331
|
-
'datadog-ci junit upload --service my-service --
|
|
312
|
+
'Upload all jUnit XML test report files in current directory and add extra metrics globally',
|
|
313
|
+
'datadog-ci junit upload --service my-service --metrics key1:123 --metrics key2:321 .',
|
|
332
314
|
],
|
|
333
315
|
[
|
|
334
316
|
'Upload all jUnit XML test report files in current directory to the datadoghq.eu site',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/commands/junit/upload.ts"],"names":[],"mappings":"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"}
|