Skip to content

Commit 40fd4ef

Browse files
weswighamweswigham
authored
Strip more kinds of timestamps and versions from dockerfile output (#32519)
* Strip more kinds of timestamps and versions from dockerfile output, rewrite office-ui-fabric dockerfile to use new lerna build system * Add another filter for just output * Update user baselines (#23) * Update user baselines (#24) * Strip only maybe-present timestamps * More lenient timestamp filter * Update user baselines (#25) * Simplify and enhance vscode dockerfile to use nightly ts in ts extension, too * Update user baselines (#26) * Update user baselines (#27)
1 parent 9ec71c3 commit 40fd4ef

File tree

7 files changed

+489
-439
lines changed

7 files changed

+489
-439
lines changed

‎src/testRunner/externalCompileRunner.ts‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,22 +185,26 @@ function stripRushStageNumbers(result: string): string {
185185
* so we purge as much of the gulp output as we can
186186
*/
187187
function sanitizeUnimportantGulpOutput(result: string): string {
188-
return result.replace(/^.*(\] (Starting)|(Finished)).*$/gm, "") // task start/end messages (nondeterministic order)
188+
return result.replace(/^.*(\] (Starting)|(Finished)).*$/gm, "") // "gulp" task start/end messages (nondeterministic order)
189+
.replace(/^.*(\] . (finished)|(started)).*$/gm, "") // "just" task start/end messages (nondeterministic order)
189190
.replace(/^.*\] Respawned to PID: \d+.*$/gm, "") // PID of child is OS and system-load dependent (likely stableish in a container but still dangerous)
190191
.replace(/\n+/g, "\n");
191192
}
192193

193194
function sanitizeTimestamps(result: string): string {
194195
return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]")
195196
.replace(/\[\d?\d:\d\d:\d\d\]/g, "[XX:XX:XX]")
197+
.replace(/\/\d+-\d+-[\d_TZ]+-debug.log/g, "\/XXXX-XX-XXXXXXXXX-debug.log")
196198
.replace(/\d+(\.\d+)? sec(onds?)?/g, "? seconds")
197199
.replace(/\d+(\.\d+)? min(utes?)?/g, "")
198-
.replace(/\d+(\.\d+)?( m)?s/g, "?s");
200+
.replace(/\d+(\.\d+)? ?m?s/g, "?s")
201+
.replace(/ \(\?s\)/g, "");
199202
}
200203

201204
function sanitizeVersionSpecifiers(result: string): string {
202205
return result
203206
.replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx")
207+
.replace(/Rush Multi-Project Build Tool (\d+)\.\d+\.\d+/g, "Rush Multi-Project Build Tool $1.X.X")
204208
.replace(/([@v\()])\d+\.\d+\.\d+/g, "$1X.X.X");
205209
}
206210

‎tests/baselines/reference/docker/azure-sdk.log‎

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,41 @@
11
Exit Code: 1
22
Standard output:
33

4-
Rush Multi-Project Build Tool 5.10.1 - https://rushjs.io
4+
Rush Multi-Project Build Tool 5.X.X - https://rushjs.io
55
Starting "rush rebuild"
6-
Executing a maximum of 1 simultaneous processes...
7-
[@azure/cosmos] started
6+
Executing a maximum of ?simultaneous processes...
7+
XX of XX: [@azure/abort-controller] completed successfully in ? seconds
8+
XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds
9+
XX of XX: [@azure/core-paging] completed successfully in ? seconds
810
XX of XX: [@azure/cosmos] completed successfully in ? seconds
9-
[@azure/event-processor-host] started
1011
XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
11-
[@azure/service-bus] started
1212
Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
13-
[@azure/storage-blob] started
1413
XX of XX: [@azure/storage-blob] completed successfully in ? seconds
15-
[@azure/storage-file] started
1614
XX of XX: [@azure/storage-file] completed successfully in ? seconds
17-
[@azure/storage-queue] started
1815
XX of XX: [@azure/storage-queue] completed successfully in ? seconds
19-
[@azure/template] started
2016
XX of XX: [@azure/template] completed successfully in ? seconds
21-
[testhub] started
2217
XX of XX: [testhub] completed successfully in ? seconds
23-
[@azure/abort-controller] started
24-
XX of XX: [@azure/abort-controller] completed successfully in ? seconds
25-
[@azure/core-asynciterator-polyfill] started
26-
XX of XX: [@azure/core-asynciterator-polyfill] completed successfully in ? seconds
27-
[@azure/core-auth] started
2818
XX of XX: [@azure/core-auth] completed successfully in ? seconds
29-
[@azure/core-http] started
3019
npm ERR! code ELIFECYCLE
3120
npm ERR! errno 2
32-
npm ERR! @azure/core-http@X.X.X-preview.1 build:tsc: `tsc -p tsconfig.es.json`
21+
npm ERR! @azure/core-http@X.X.X-preview.2 build:tsc: `tsc -p tsconfig.es.json`
3322
npm ERR! Exit status 2
3423
npm ERR!
35-
npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
24+
npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:tsc script.
3625
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
3726
npm ERR! A complete log of this run can be found in:
38-
npm ERR! /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
27+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
3928
ERROR: "build:tsc" exited with 2.
4029
npm ERR! code ELIFECYCLE
4130
npm ERR! errno 1
42-
npm ERR! @azure/core-http@X.X.X-preview.1 build:lib: `run-s build:tsc build:rollup build:minify-browser`
31+
npm ERR! @azure/core-http@X.X.X-preview.2 build:lib: `run-s build:tsc build:rollup build:minify-browser`
4332
npm ERR! Exit status 1
4433
npm ERR!
45-
npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
34+
npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:lib script.
4635
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
4736
npm ERR! A complete log of this run can be found in:
48-
npm ERR! /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
37+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
4938
ERROR: "build:lib" exited with 1.
50-
[@azure/core-paging] started
51-
XX of XX: [@azure/core-paging] completed successfully in ? seconds
5239
SUCCESS (11)
5340
================================
5441
@azure/abort-controller (? seconds)
@@ -83,23 +70,23 @@ FAILURE (1)
8370
@azure/core-http (? seconds)
8471
npm ERR! code ELIFECYCLE
8572
npm ERR! errno 2
86-
npm ERR! @azure/core-http@X.X.X-preview.1 build:tsc: `tsc -p tsconfig.es.json`
73+
npm ERR! @azure/core-http@X.X.X-preview.2 build:tsc: `tsc -p tsconfig.es.json`
8774
npm ERR! Exit status 2
8875
npm ERR!
89-
npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:tsc script.
76+
npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:tsc script.
9077
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
9178
npm ERR! A complete log of this run can be found in:
92-
npm ERR! /root/.npm/_logs/2019-07-19T13_40_31_496Z-debug.log
79+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
9380
ERROR: "build:tsc" exited with 2.
9481
npm ERR! code ELIFECYCLE
9582
npm ERR! errno 1
96-
npm ERR! @azure/core-http@X.X.X-preview.1 build:lib: `run-s build:tsc build:rollup build:minify-browser`
83+
npm ERR! @azure/core-http@X.X.X-preview.2 build:lib: `run-s build:tsc build:rollup build:minify-browser`
9784
npm ERR! Exit status 1
9885
npm ERR!
99-
npm ERR! Failed at the @azure/core-http@X.X.X-preview.1 build:lib script.
86+
npm ERR! Failed at the @azure/core-http@X.X.X-preview.2 build:lib script.
10087
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
10188
npm ERR! A complete log of this run can be found in:
102-
npm ERR! /root/.npm/_logs/2019-07-19T13_40_31_533Z-debug.log
89+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
10390
ERROR: "build:lib" exited with 1.
10491
================================
10592
Error: Project(s) failed to build
@@ -112,10 +99,10 @@ Your version of Node.js (X.X.X) has not been tested with this release of Rush. T
11299
XX of XX: [@azure/service-bus] completed with warnings in ? seconds
113100
XX of XX: [@azure/core-http] failed to build!
114101
XX of XX: [@azure/core-arm] blocked by [@azure/core-http]!
115-
XX of XX: [@azure/identity] blocked by [@azure/core-http]!
116-
XX of XX: [@azure/core-amqp] blocked by [@azure/core-http]!
117-
XX of XX: [@azure/event-hubs] blocked by [@azure/core-http]!
118102
XX of XX: [@azure/keyvault-certificates] blocked by [@azure/core-http]!
119103
XX of XX: [@azure/keyvault-keys] blocked by [@azure/core-http]!
120104
XX of XX: [@azure/keyvault-secrets] blocked by [@azure/core-http]!
105+
XX of XX: [@azure/identity] blocked by [@azure/core-http]!
106+
XX of XX: [@azure/core-amqp] blocked by [@azure/core-http]!
107+
XX of XX: [@azure/event-hubs] blocked by [@azure/core-http]!
121108
[@azure/core-http] Returned error code: 1

0 commit comments

Comments
 (0)