Fix Perf top Page

Signed-off-by: Lan Xia <[email protected]>
llxia · Jan 31, 2025 · 78af9b3 · 78af9b3
1 parent a7a6b4d
commit 78af9b3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/test-result-summary-client/src/Build/ReleaseSummary.jsx b/test-result-summary-client/src/Build/ReleaseSummary.jsx
@@ -50,7 +50,7 @@ const ReleaseSummary = () => {
                 const rerunBuildsRes = fetchData(
                     `/api/getAllChildBuilds${params({
                         parentId,
-                        buildNameRegex: 'Test_openjdk.*_rerun',
+                        buildNameRegex: '(Test|Perf)_openjdk.*_rerun',
                     })}`
                 );
 
@@ -83,7 +83,10 @@ const ReleaseSummary = () => {
                                 buildResultStr = ` ⚠️ ${buildResult} ⚠️${nl}`;
                             }
 
-                            if (buildName.startsWith('Test_openjdk')) {
+                            if (
+                                buildName.startsWith('Test_openjdk') ||
+                                buildName.startsWith('Perf_openjdk')
+                            ) {
                                 let rerunLinkInfo = '';
                                 if (rerunFailedLink) {
                                     rerunLinkInfo = `Rerun [failed](${rerunFailedLink})${nl}`;

diff --git a/test-result-summary-client/src/Build/Summary/ResultSummary.jsx b/test-result-summary-client/src/Build/Summary/ResultSummary.jsx
@@ -61,7 +61,7 @@ export default function ResultSummary() {
                 })}`
             );
             // get all child builds info based on buildNameRegex
-            const buildNameRegex = '^Test_openjdk.*';
+            const buildNameRegex = '^(Test|Perf)_openjdk.*';
             const testSummaryResult = undefined;
             const buildResult = undefined;
 

diff --git a/test-result-summary-client/src/Build/TopLevelBuilds.jsx b/test-result-summary-client/src/Build/TopLevelBuilds.jsx
@@ -14,13 +14,13 @@ function TopLevelBuilds() {
     const updateData = async (type) => {
         if (!type) type = 'Test';
         let results = '';
-        if (type === 'Test') {
+        if (type === 'AQAvitCert') {
             results = await fetchData(
-                `/api/getTopLevelBuildNames?type=${type}`
+                `/api/getTopLevelBuildNames?type=Test&AQAvitCert=true`
             );
-        } else if (type === 'AQAvitCert') {
+        } else {
             results = await fetchData(
-                `/api/getTopLevelBuildNames?type=Test&AQAvitCert=true`
+                `/api/getTopLevelBuildNames?type=${type}`
             );
         }
         const builds = {};

diff --git a/test-result-summary-client/src/utils/Utils.js b/test-result-summary-client/src/utils/Utils.js
@@ -7,7 +7,7 @@ export const order = (a, b) => {
 };
 export const getInfoFromBuildName = (buildName) => {
     const regex =
-        /^Test_openjdk(\w+)_(\w+)_(\w+).(.+?)_(.+?_.+?(_xl|_fips140_2|_fips140_3_openjceplusfips|_fips140_3_openjceplusfips.fips140-3|_criu)?)(_.+)?$/i;
+        /^(Test|Perf)_openjdk(\w+)_(\w+)_(\w+).(.+?)_(.+?_.+?(_xl|_fips140_2|_fips140_3_openjceplusfips|_fips140_3_openjceplusfips.fips140-3|_criu)?)(_.+)?$/i;
     const tokens = buildName.match(regex);
     if (Array.isArray(tokens) && tokens.length > 5) {
         const [_, jdkVersion, jdkImpl, level, group, platform] = tokens;