Skip to content

Commit 8216b1b

Browse files
davehuntdavehunt
committed
Show mozilla-beta data
1 parent 016ad29 commit 8216b1b

3 files changed

Lines changed: 18 additions & 23 deletions

File tree

‎src/awfy.js‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PROJECT, ALT_PROJECT } from './utils/perfherder';
1+
import { ALT_PROJECT } from './utils/perfherder';
22
import { queryInfoGen } from './config-utils';
33
import { BENCHMARKS as AWSY_BENCHMARKS, DEFAULT_CATEGORIES as AWSY_CATEGORIES } from './awsy';
44
import { BENCHMARKS as H3_BENCHMARKS, DEFAULT_SUITES as H3_SUITES } from './h3';
@@ -49,14 +49,12 @@ const DESKTOP_FIREFOX_APPS = {
4949
name: 'firefox',
5050
label: 'Firefox',
5151
color: PALETTE.orange,
52-
project: ALT_PROJECT,
5352
extraOptions: ['webrender'],
5453
},
5554
'firefox-fission': {
5655
name: 'firefox',
5756
label: 'Firefox-Fission',
5857
color: PALETTE.red,
59-
project: PROJECT,
6058
extraOptions: ['fission', 'webrender'],
6159
},
6260
};
@@ -67,11 +65,13 @@ const DESKTOP_APPS = {
6765
name: 'chrome',
6866
label: 'Chrome',
6967
color: PALETTE.blue,
68+
project: ALT_PROJECT,
7069
},
7170
chromium: {
7271
name: 'chromium',
7372
label: 'Chromium',
7473
color: PALETTE.emerald,
74+
project: ALT_PROJECT,
7575
},
7676
};
7777

@@ -81,22 +81,19 @@ const WASM_APPS = {
8181
name: 'firefox',
8282
label: 'Firefox (tiering)',
8383
color: PALETTE.orange,
84-
project: ALT_PROJECT,
8584
extraOptions: ['webrender'],
8685
},
8786
'baseline-firefox': {
8887
name: 'firefox',
8988
label: 'Firefox (wasm-baseline)',
9089
color: PALETTE.violet,
91-
project: PROJECT,
9290
suiteSuffix: 'baseline',
9391
extraOptions: ['webrender'],
9492
},
9593
'optimizing-firefox': {
9694
name: 'firefox',
9795
label: 'Firefox (wasm-optimizing)',
9896
color: PALETTE.pink,
99-
project: PROJECT,
10097
suiteSuffix: 'optimizing',
10198
extraOptions: ['webrender'],
10299
},
@@ -219,11 +216,11 @@ const JSBENCH_APPS = {
219216
sm: {
220217
label: 'SpiderMonkey',
221218
color: PALETTE.violet,
222-
project: ALT_PROJECT,
223219
},
224220
v8: {
225221
label: 'Chromium v8',
226222
color: PALETTE.pink,
223+
project: ALT_PROJECT,
227224
},
228225
};
229226

@@ -340,7 +337,7 @@ Object.entries(SITES).forEach(([siteKey, siteLabel]) => {
340337
test: 'SpeedIndex',
341338
application: app.name,
342339
platformSuffix: app.platformSuffix,
343-
project: live ? PROJECT : app.project,
340+
project: live ? ALT_PROJECT : app.project,
344341
option: 'opt',
345342
extraOptions: [cacheVariant],
346343
};
@@ -373,7 +370,6 @@ const MOBILE_APPS = {
373370
name: 'geckoview',
374371
label: 'GeckoView',
375372
color: PALETTE.indigo,
376-
project: ALT_PROJECT,
377373
extraOptions: ['webrender'],
378374
},
379375
};
@@ -428,7 +424,7 @@ Object.entries(SITES).forEach(([siteKey, siteLabel]) => {
428424
BENCHMARKS[bmKey].compare[appKey].extraOptions.push('live');
429425
if (app.name === 'fenix') {
430426
// fenix live sites are running on mozilla-central
431-
BENCHMARKS[bmKey].compare[appKey].project = PROJECT;
427+
BENCHMARKS[bmKey].compare[appKey].project = ALT_PROJECT;
432428
}
433429
}
434430
if (Array.isArray(app.extraOptions)) {

‎src/utils/perfherder.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { stringify } from 'query-string';
33
import fetchAndCache from './fetchAndCache';
44

55
export const TREEHERDER = 'https://treeherder.mozilla.org';
6-
export const PROJECT = 'mozilla-central';
7-
export const ALT_PROJECT = 'autoland';
6+
export const PROJECT = 'mozilla-beta';
7+
export const ALT_PROJECT = 'mozilla-central';
88
const DEFAULT_TIMERANGE = 14 * 24 * 3600;
99

1010
export const signaturesUrl = (project = PROJECT) => (
@@ -26,7 +26,7 @@ export const perfDataUrls = ({ frameworkId, project }, signatureIds, timeRange)
2626
interval: timeRange,
2727
no_retriggers: true,
2828
});
29-
// To guarantee order for tests
29+
// To guarantee order for tests
3030
signatureIds.sort();
3131
const urls = [];
3232
for (let i = 0; i < (signatureIds.length) / 100; i += 1) {
@@ -128,7 +128,7 @@ const signaturesForPlatformSuite = async (seriesConfig) => {
128128
if (
129129
jobSignature.suite === seriesConfig.suite
130130
&& ((jobSignature.suite !== jobSignature.test && jobSignature.test === seriesConfig.test)
131-
|| (jobSignature.suite === jobSignature.test))
131+
|| (jobSignature.suite === jobSignature.test))
132132
) {
133133
res[signatureId] = {
134134
parentSignatureHash: jobSignature.signature_hash,

‎test/config.test.js‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { BENCHMARKS, CONFIG, queryInfo } from '../src/config';
2-
import { ALT_PROJECT } from '../src/utils/perfherder';
32

43
// eslint-disable-next-line jest/expect-expect
54
it('Verify all benchmarks are defined', () => {
@@ -27,7 +26,7 @@ it('Query info', () => {
2726
option: 'opt',
2827
platform: 'linux1804-64-shippable-qr',
2928
platformSuffix: undefined,
30-
project: 'autoland',
29+
project: undefined,
3130
extraOptions: ['webrender'],
3231
},
3332
{
@@ -39,7 +38,7 @@ it('Query info', () => {
3938
option: 'opt',
4039
platform: 'linux1804-64-shippable-qr',
4140
platformSuffix: undefined,
42-
project: 'mozilla-central',
41+
project: undefined,
4342
extraOptions: ['fission', 'webrender'],
4443
},
4544
{
@@ -51,7 +50,7 @@ it('Query info', () => {
5150
option: 'opt',
5251
platform: 'linux1804-64-shippable-qr',
5352
platformSuffix: undefined,
54-
project: undefined,
53+
project: 'mozilla-central',
5554
extraOptions: undefined,
5655
},
5756
{
@@ -63,7 +62,7 @@ it('Query info', () => {
6362
option: 'opt',
6463
platform: 'linux1804-64-shippable-qr',
6564
platformSuffix: undefined,
66-
project: undefined,
65+
project: 'mozilla-central',
6766
extraOptions: undefined,
6867
},
6968
{
@@ -75,7 +74,7 @@ it('Query info', () => {
7574
option: 'opt',
7675
platform: 'linux1804-64-shippable-qr',
7776
platformSuffix: undefined,
78-
project: 'mozilla-central',
77+
project: undefined,
7978
extraOptions: ['webrender'],
8079
},
8180
{
@@ -87,7 +86,7 @@ it('Query info', () => {
8786
option: 'opt',
8887
platform: 'linux1804-64-shippable-qr',
8988
platformSuffix: undefined,
90-
project: 'mozilla-central',
89+
project: undefined,
9190
extraOptions: ['webrender'],
9291
},
9392
],
@@ -111,7 +110,7 @@ it('Query info - suite with explicit project and platformSuffix ', () => {
111110
frameworkId: 1,
112111
suite: 'rasterflood_svg',
113112
platformSuffix: undefined,
114-
project: ALT_PROJECT,
113+
project: undefined,
115114
option: 'opt',
116115
platform: 'linux1804-64-shippable-qr',
117116
extraOptions: ['e10s', 'stylo', 'webrender'],
@@ -123,7 +122,7 @@ it('Query info - suite with explicit project and platformSuffix ', () => {
123122
frameworkId: 1,
124123
suite: 'rasterflood_svg',
125124
platformSuffix: undefined,
126-
project: 'mozilla-central',
125+
project: undefined,
127126
option: 'opt',
128127
platform: 'linux1804-64-shippable-qr',
129128
extraOptions: ['e10s', 'stylo', 'fission', 'webrender'],

0 commit comments

Comments
 (0)