Skip to content

Commit 05e9b0e

Browse files
committed
Strip more kinds of timestamps and versions from dockerfile output, rewrite office-ui-fabric dockerfile to use new lerna build system
1 parent 70b7bd5 commit 05e9b0e

File tree

5 files changed

+667
-397
lines changed

5 files changed

+667
-397
lines changed

src/testRunner/externalCompileRunner.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,7 @@ function sanitizeUnimportantGulpOutput(result: string): string {
193193
function sanitizeTimestamps(result: string): string {
194194
return result.replace(/\[\d?\d:\d\d:\d\d (A|P)M\]/g, "[XX:XX:XX XM]")
195195
.replace(/\[\d?\d:\d\d:\d\d\]/g, "[XX:XX:XX]")
196+
.replace(/\/\d+-\d+-[\d_TZ]+-debug.log/g, "\/XXXX-XX-XXXXXXXXX-debug.log")
196197
.replace(/\d+(\.\d+)? sec(onds?)?/g, "? seconds")
197198
.replace(/\d+(\.\d+)? min(utes?)?/g, "")
198199
.replace(/\d+(\.\d+)?( m)?s/g, "?s");
@@ -201,6 +202,7 @@ function sanitizeTimestamps(result: string): string {
201202
function sanitizeVersionSpecifiers(result: string): string {
202203
return result
203204
.replace(/\d+.\d+.\d+-insiders.\d\d\d\d\d\d\d\d/g, "X.X.X-insiders.xxxxxxxx")
205+
.replace(/Rush Multi-Project Build Tool (\d+)\.\d+\.\d+/g, "Rush Multi-Project Build Tool $1.X.X")
204206
.replace(/([@v\()])\d+\.\d+\.\d+/g, "$1X.X.X");
205207
}
206208

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

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
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"
66
Executing a maximum of 1 simultaneous processes...
77
[@azure/cosmos] started
88
XX of XX: [@azure/cosmos] completed successfully in ? seconds
99
[@azure/event-processor-host] started
1010
XX of XX: [@azure/event-processor-host] completed successfully in ? seconds
11-
[@azure/service-bus] started
12-
Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
1311
[@azure/storage-blob] started
1412
XX of XX: [@azure/storage-blob] completed successfully in ? seconds
1513
[@azure/storage-file] started
@@ -35,7 +33,7 @@ npm ERR!
3533
npm ERR! Failed at the @azure/[email protected] build:tsc script.
3634
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
3735
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
36+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
3937
ERROR: "build:tsc" exited with 2.
4038
npm ERR! code ELIFECYCLE
4139
npm ERR! errno 1
@@ -45,7 +43,7 @@ npm ERR!
4543
npm ERR! Failed at the @azure/[email protected] build:lib script.
4644
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
4745
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
46+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
4947
ERROR: "build:lib" exited with 1.
5048
[@azure/core-paging] started
5149
XX of XX: [@azure/core-paging] completed successfully in ? seconds
@@ -63,12 +61,7 @@ SUCCESS (11)
6361
@azure/template (? seconds)
6462
testhub (? seconds)
6563
================================
66-
SUCCESS WITH WARNINGS (1)
67-
================================
68-
@azure/service-bus (? seconds)
69-
Warning: You have changed the public API signature for this project. Updating review/service-bus.api.md
70-
================================
71-
BLOCKED (7)
64+
BLOCKED (8)
7265
================================
7366
@azure/core-amqp
7467
@azure/core-arm
@@ -77,6 +70,7 @@ BLOCKED (7)
7770
@azure/keyvault-certificates
7871
@azure/keyvault-keys
7972
@azure/keyvault-secrets
73+
@azure/service-bus
8074
================================
8175
FAILURE (1)
8276
================================
@@ -89,7 +83,7 @@ npm ERR!
8983
npm ERR! Failed at the @azure/[email protected] build:tsc script.
9084
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
9185
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
86+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
9387
ERROR: "build:tsc" exited with 2.
9488
npm ERR! code ELIFECYCLE
9589
npm ERR! errno 1
@@ -99,7 +93,7 @@ npm ERR!
9993
npm ERR! Failed at the @azure/[email protected] build:lib script.
10094
npm ERR! This is probably not a problem with npm. There is likely additional logging output above.
10195
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
96+
npm ERR! /root/.npm/_logs/XXXX-XX-XXXXXXXXX-debug.log
10397
ERROR: "build:lib" exited with 1.
10498
================================
10599
Error: Project(s) failed to build
@@ -109,13 +103,13 @@ rush rebuild - Errors! ( ? seconds)
109103

110104
Standard error:
111105
Your version of Node.js (X.X.X) has not been tested with this release of Rush. The Rush team will not accept issue reports for it. Please consider upgrading Rush or downgrading Node.js.
112-
XX of XX: [@azure/service-bus] completed with warnings in ? seconds
113106
XX of XX: [@azure/core-http] failed to build!
114107
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]!
118108
XX of XX: [@azure/keyvault-certificates] blocked by [@azure/core-http]!
119109
XX of XX: [@azure/keyvault-keys] blocked by [@azure/core-http]!
120110
XX of XX: [@azure/keyvault-secrets] blocked by [@azure/core-http]!
111+
XX of XX: [@azure/identity] blocked by [@azure/core-http]!
112+
XX of XX: [@azure/core-amqp] blocked by [@azure/core-http]!
113+
XX of XX: [@azure/event-hubs] blocked by [@azure/core-http]!
114+
XX of XX: [@azure/service-bus] blocked by [@azure/core-http]!
121115
[@azure/core-http] Returned error code: 1

0 commit comments

Comments
 (0)