Support rerun builds in UI

related: adoptium#770
Signed-off-by: Lan Xia <[email protected]>

test-result-summary-client/src/Build/Summary/ResultGrid.css

@@ -44,6 +44,7 @@
 }
 
 .cell {
+ position: relative;
  color: #fff;
  border-radius: 4px;
  padding: 4px;

test-result-summary-client/src/Build/Summary/ResultGrid.jsx

@@ -7,6 +7,7 @@ import {
  MinusCircleOutlined,
  StopOutlined,
  WarningOutlined,
+ InfoCircleOutlined,
 } from '@ant-design/icons';
 
 import { Tooltip } from 'antd';
@@ -51,6 +52,8 @@ class Cell extends Component {
  );
  }
  const result = groups[group].buildResult;
+ const rerunBuildUrl =
+ groups[group].rerunBuildUrl;
  let element = '';
  if (!groups[group].testSummary) {
  element = (
@@ -92,12 +95,26 @@ class Cell extends Component {
  ? 'Build Result is from TestBenchmarkParser (not CI build)'
  : ''}{' '}
  <br />
+ Jenkins link:
+ <br />
+ {rerunBuildUrl ? (
+ <a
+ href={rerunBuildUrl}
+ target="_blank"
+ rel="noopener noreferrer"
+ >
+ Rerun build
+ </a>
+ ) : (
+ 'no'
+ )}{' '}
+ <br />
  <a
  href={groups[group].buildUrl}
  target="_blank"
  rel="noopener noreferrer"
  >
- Jenkins Link
+ Test build
  </a>
  </div>
  );
@@ -172,6 +189,19 @@ class Cell extends Component {
  <Tooltip title={<div>{element}</div>}>
  {linkInfo}
  </Tooltip>
+ {rerunBuildUrl && (
+ <InfoCircleOutlined
+ style={{
+ position: 'absolute',
+ color: 'orange',
+ fontSize: '12px',
+ top: -5,
+ right: -5,
+ background: 'white',
+ borderRadius: '100%',
+ }}
+ />
+ )}
  </div>
  );
  })}

test-result-summary-client/src/Build/Summary/ResultSummary.jsx

@@ -106,7 +106,8 @@ export default class ResultSummary extends Component {
  jdkImpl = 'j9';
  }
  // use non-capture group to ignore words evaluation and release if present
- const regex = /^jdk(\d+).?(?:-evaluation|-release)?-(\w+)-(\w+)-(\w+)/i;
+ const regex =
+ /^jdk(\d+).?(?:-evaluation|-release)?-(\w+)-(\w+)-(\w+)/i;
  const tokens = buildName.match(regex);
  if (Array.isArray(tokens) && tokens.length > 4) {
  jdkVersion = tokens[1];
@@ -168,16 +169,14 @@ export default class ResultSummary extends Component {
  childBuildsResult = setBuildsStatus(build, childBuildsResult);
  });
  builds.sort((a, b) => a.buildName.localeCompare(b.buildName));
+
  builds.forEach((build) => {
  const buildName = build.buildName.toLowerCase();
  if (getInfoFromBuildName(buildName)) {
- const {
- jdkVersion,
- jdkImpl,
- level,
- group,
- platform,
- } = getInfoFromBuildName(buildName);
+ const { jdkVersion, jdkImpl, level, group, platform, rerun } =
+ getInfoFromBuildName(buildName);
+
+ const hasRerun = rerun ? rerun : false;
  if (jdkVersion && jdkImpl && level && group && platform) {
  buildMap[platform] = buildMap[platform] || {};
  buildMap[platform][jdkVersion] =
@@ -214,7 +213,7 @@ export default class ResultSummary extends Component {
  buildMap[platform][jdkVersion][jdkImpl][level][
  group
  ].hasChildren = build.hasChildren;
- } else if (build.testSummary) {
+ } else if (build.testSummary && !hasRerun) {
  buildMap[platform][jdkVersion][jdkImpl][level][
  group
  ].testSummary = buildMap[platform][jdkVersion][
@@ -254,16 +253,28 @@ export default class ResultSummary extends Component {
  group
  ].testSummary.total += total;
  }
+ if (
+ hasRerun &&
+ !buildMap[platform][jdkVersion][jdkImpl][level][
+ group
+ ].rerunBuildUrl
+ ) {
+ buildMap[platform][jdkVersion][jdkImpl][level][
+ group
+ ].rerunBuildUrl = build.buildUrl;
+ console.log('build.buildUrl1', build.buildUrl);
+ }
  } else {
- buildMap[platform][jdkVersion][jdkImpl][level][
- group
- ] = {
- buildResult: build.buildResult,
- testSummary: build.testSummary,
- buildUrl: build.buildUrl,
- buildId: build._id,
- hasChildren: build.hasChildren,
- };
+ buildMap[platform][jdkVersion][jdkImpl][level][group] =
+ {
+ buildResult: build.buildResult,
+ testSummary: build.testSummary,
+ buildUrl: build.buildUrl,
+ buildId: build._id,
+ hasChildren: build.hasChildren,
+
+ rerunBuildUrl: hasRerun ? build.buildUrl : '',
+ };
  }
  }
  }

test-result-summary-client/src/Build/TestTable.jsx

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import TextFilter from '../utils/TextFilter';
 import {
  ClusterOutlined,
+ InfoCircleOutlined,
  GithubOutlined,
  HistoryOutlined,
  QuestionCircleOutlined,
@@ -82,6 +83,36 @@ export default class TestTable extends Component {
  );
  });
  }
+ const renderTestName = (value, row) => {
+ const testName = value;
+ const { buildName } = row;
+ let rerun = false;
+ if (buildName && buildName.includes('_rerun')) {
+ rerun = true;
+ }
+ return (
+ <span>
+ <div>
+ {rerun ? (
+ <>
+ {testName}
+ <Tooltip title="Rerun">
+ <InfoCircleOutlined
+ style={{
+ color: 'orange',
+ fontSize: '12px',
+ verticalAlign: 'top',
+ }}
+ />
+ </Tooltip>
+ </>
+ ) : (
+ testName
+ )}
+ </div>
+ </span>
+ );
+ };
 
  const renderAction = (value, row) => {
  const { testId, testName } = value;
@@ -202,6 +233,7 @@ export default class TestTable extends Component {
  handleFilterChange={this.handleFilterChange}
  />
  ),
+ render: renderTestName,
  },
  {
  title: 'Action',

test-result-summary-client/src/utils/Utils.js

@@ -11,7 +11,11 @@ export const getInfoFromBuildName = (buildName) => {
  const tokens = buildName.match(regex);
  if (Array.isArray(tokens) && tokens.length > 5) {
  const [_, jdkVersion, jdkImpl, level, group, platform] = tokens;
- return { jdkVersion, jdkImpl, level, group, platform };
+ let rerun = false;
+ if (buildName.includes('_rerun')) {
+ rerun = true;
+ }
+ return { jdkVersion, jdkImpl, level, group, platform, rerun };
  }
  return null;
 };