Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mozilla/treeherder
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3d7e8ab0c32ece80e12354e4ba408ffd204449fe
Choose a base ref
..
head repository: mozilla/treeherder
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9ac2d67fe639f930e105069521d0e401952a87f9
Choose a head ref
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@ jobs:
executor:
name: node/default
# The Node version here must be kept in sync with that in `package.json`.
tag: '21.1.0'
tag: '22.11.0'
steps:
- checkout
- node/install-packages:
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Frontend stage
FROM node:21.1.0 AS frontend
FROM node:22.11.0 AS frontend

WORKDIR /app

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
},
"license": "MPL-2.0",
"engines": {
"node": "21.1.0",
"node": "22.11.0",
"yarn": "1.22.22"
},
"dependencies": {
@@ -41,7 +41,7 @@
"moment": "2.29.4",
"numeral": "2.0.6",
"pako": "2.0.4",
"prop-types": "15.7.2",
"prop-types": "15.8.1",
"query-string": "7.0.1",
"react": "18.3.1",
"react-dates": "21.8.0",
@@ -106,7 +106,7 @@
"jest": "28.1.3",
"jest-environment-puppeteer": "10.1.4",
"jest-puppeteer": "9.0.2",
"markdownlint-cli": "0.32.2",
"markdownlint-cli": "0.43.0",
"mini-css-extract-plugin": "2.6.1",
"path": "0.12.7",
"prettier": "2.0.5",
61 changes: 56 additions & 5 deletions tests/ui/job-view/PerformanceTab_test.jsx
Original file line number Diff line number Diff line change
@@ -8,6 +8,7 @@ import {
history,
} from '../../../ui/job-view/redux/configureStore';
import PerformanceTab from '../../../ui/job-view/details/tabs/PerformanceTab.jsx';
import { Perfdocs } from '../../../ui/perfherder/perf-helpers/perfdocs';

describe('PerformanceTab', () => {
const testPerformanceTab = ({
@@ -47,7 +48,17 @@ describe('PerformanceTab', () => {
hasSideBySide: false,
},
jobDetails: [],
perfJobDetail: [],
perfJobDetail: [
{
frameworkName: 'browsertime',
perfdocs: new Perfdocs(
'browsertime',
'outlook',
'macosx1015-64-shippable-qr',
'outlook ContentfulSpeedIndex opt cold fission webrender',
),
},
],
}),
);

@@ -78,7 +89,17 @@ describe('PerformanceTab', () => {
value: 'profile_build_resources.json',
},
],
perfJobDetail: [],
perfJobDetail: [
{
frameworkName: 'browsertime',
perfdocs: new Perfdocs(
'browsertime',
'outlook',
'macosx1015-64-shippable-qr',
'outlook ContentfulSpeedIndex opt cold fission webrender',
),
},
],
}),
);

@@ -105,7 +126,17 @@ describe('PerformanceTab', () => {
value: 'profile_something.zip',
},
],
perfJobDetail: [],
perfJobDetail: [
{
frameworkName: 'browsertime',
perfdocs: new Perfdocs(
'browsertime',
'outlook',
'macosx1015-64-shippable-qr',
'outlook ContentfulSpeedIndex opt cold fission webrender',
),
},
],
}),
);

@@ -138,7 +169,17 @@ describe('PerformanceTab', () => {
value: 'profile_something.json',
},
],
perfJobDetail: [],
perfJobDetail: [
{
frameworkName: 'browsertime',
perfdocs: new Perfdocs(
'browsertime',
'outlook',
'macosx1015-64-shippable-qr',
'outlook ContentfulSpeedIndex opt cold fission webrender',
),
},
],
}),
);

@@ -171,7 +212,17 @@ describe('PerformanceTab', () => {
value: 'profile_something.zip',
},
],
perfJobDetail: [],
perfJobDetail: [
{
frameworkName: 'browsertime',
perfdocs: new Perfdocs(
'browsertime',
'outlook',
'macosx1015-64-shippable-qr',
'outlook ContentfulSpeedIndex opt cold fission webrender',
),
},
],
}),
);

24 changes: 22 additions & 2 deletions ui/helpers/constants.js
Original file line number Diff line number Diff line change
@@ -81,6 +81,9 @@ export const thPlatformMap = {
'macosx1100-aarch64-qr': 'OS X 11 AArch64 WebRender',
'macosx1100-aarch64-shippable-qr': 'OS X 11 AArch64 WebRender Shippable',
'macosx1300-64-shippable-qr': 'macOS 13 x64 Shippable WebRender',
'macosx1400-64-shippable-qr': 'macOS 14.00 x64 Shippable WebRender',
'macosx1470-64': 'macOS 14.70 x64',
'macosx1470-64-shippable': 'macOS 14.70 x64 Shippable',
macosx64: 'OS X',
osx: 'OS X',
'macosx64-shippable': 'OS X Shippable',
@@ -184,10 +187,12 @@ export const thPlatformMap = {
'android-hw-p5-13-0-arm7-shippable-qr': 'Android 13.0 Pixel5 ARMv7 Shippable',
'android-hw-p5-13-0-arm7-qr': 'Android 13.0 Pixel5 ARMv7',
'android-hw-p5-13-0-arm7': 'Android 13.0 Pixel5 ARMv7',
'android-hw-p5-13-0-aarch64': 'Android 13.0 Pixel5 AArch64',
'android-hw-p6-13-0-aarch64': 'Android 13.0 Pixel6 AArch64',
'android-hw-p6-13-0-aarch64-shippable':
'Android 13.0 Pixel6 AArch64 Shippable',
'android-hw-a55-14-0-aarch64-shippable':
'Android 14.0 Galaxy A55 AArch64 Shippable',
'android-hw-a55-14-0-aarch64-shippable': 'Android 14.0 Galaxy A55 AArch64',
'android-hw-a55-14-0-aarch64': 'Android 14.0 Galaxy A55 AArch64 Shippable',
'android-hw-a55-14-0-android-aarch64-shippable-qr':
'Android 14.0 Galaxy A55 AArch64 Shippable',
'android-hw-s24-14-0-aarch64-shippable':
@@ -215,6 +220,21 @@ export const thPlatformMap = {
toolchains: 'Toolchains',
updatebot: 'Updatebot',
codeql: 'codeql',
'linux64-snap-amd64-nightly': 'Linux x64 Snap amd64 nightly',
'linux64-snap-amd64-beta': 'Linux x64 Snap amd64 beta',
'linux64-snap-amd64-stable': 'Linux x64 Snap amd64 stable',
'linux64-snap-amd64-esr128': 'Linux x64 Snap amd64 esr128',
'linux64-snap-amd64-esr': 'Linux x64 Snap amd64 esr',
'linux64-snap-amd64-2204-nightly': 'Linux 22.04 x64 Snap amd64 nightly',
'linux64-snap-amd64-2204-beta': 'Linux 22.04 x64 Snap amd64 beta',
'linux64-snap-amd64-2204-stable': 'Linux 22.04 x64 Snap amd64 stable',
'linux64-snap-amd64-2204-esr128': 'Linux 22.04 x64 Snap amd64 esr128',
'linux64-snap-amd64-2204-esr': 'Linux 22.04 x64 Snap amd64 esr',
'linux64-snap-amd64-2404-nightly': 'Linux 24.04 x64 Snap amd64 nightly',
'linux64-snap-amd64-2404-beta': 'Linux 24.04 x64 Snap amd64 beta',
'linux64-snap-amd64-2404-stable': 'Linux 24.04 x64 Snap amd64 stable',
'linux64-snap-amd64-2404-esr128': 'Linux 24.04 x64 Snap amd64 esr128',
'linux64-snap-amd64-2404-esr': 'Linux 24.04 x64 Snap amd64 esr',
other: 'Other',
};

6 changes: 4 additions & 2 deletions ui/helpers/url.js
Original file line number Diff line number Diff line change
@@ -127,8 +127,10 @@ export const getPushHealthUrl = function getPushHealthUrl(params) {
return `${uiPushHealthBase}/push${createQueryParams(params)}`;
};

export const getCompareChooserUrl = function getCompareChooserUrl(params) {
return `/perfherder/comparechooser${createQueryParams(params)}`;
export const getPerfCompareChooserUrl = function getPerfCompareChooserUrl(
params,
) {
return `https://perf.compare${createQueryParams(params)}`;
};

export const parseQueryParams = function parseQueryParams(search) {
1 change: 1 addition & 0 deletions ui/job-view/details/DetailsPanel.jsx
Original file line number Diff line number Diff line change
@@ -287,6 +287,7 @@ class DetailsPanel extends React.Component {
title: d.series.name,
suite: d.series.suite,
options: d.series.options.join(' '),
frameworkName: mappedFrameworks[d.series.frameworkId],
perfdocs: new Perfdocs(
mappedFrameworks[d.series.frameworkId],
d.series.suite,
9 changes: 5 additions & 4 deletions ui/job-view/details/tabs/PerformanceTab.jsx
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ import {
import { faYoutube } from '@fortawesome/free-brands-svg-icons';

import {
getCompareChooserUrl,
getPerfCompareChooserUrl,
getJobsUrl,
getPerfAnalysisUrl,
} from '../../../helpers/url';
@@ -236,9 +236,10 @@ class PerformanceTab extends React.PureComponent {
</Button>
)}
<a
href={getCompareChooserUrl({
newProject: repoName,
newRevision: revision,
href={getPerfCompareChooserUrl({
newRepo: repoName,
newRev: revision,
frameworkName: perfJobDetail[0].frameworkName,
})}
target="_blank"
rel="noopener noreferrer"
8 changes: 4 additions & 4 deletions ui/job-view/pushes/PushActionMenu.jsx
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ import { push as pushRoute } from 'connected-react-router';
import {
createQueryParams,
getPushHealthUrl,
getCompareChooserUrl,
getPerfCompareChooserUrl,
parseQueryParams,
} from '../../helpers/url';
import { formatTaskclusterError } from '../../helpers/errorMessage';
@@ -172,9 +172,9 @@ class PushActionMenu extends React.PureComponent {
</DropdownItem>
<DropdownItem
tag="a"
href={getCompareChooserUrl({
newProject: currentRepo.name,
newRevision: revision,
href={getPerfCompareChooserUrl({
newRepo: currentRepo.name,
newRev: revision,
})}
target="_blank"
rel="noopener noreferrer"
Loading