Read Dashboard build info from a json file

Closes: adoptium#7 Signed-off-by: lanxia <lan_xia@ca.ibm.com>
llxia · Sep 17, 2018 · 066406f · 066406f
1 parent d2289af
commit 066406f
Show file tree

Hide file tree

Showing 6 changed files with 219 additions and 182 deletions.
diff --git a/TestResultSummaryService/DashboardBuildInfo.json b/TestResultSummaryService/DashboardBuildInfo.json
@@ -0,0 +1,110 @@
+{
+    "CustomJenkins": {
+        "url": "https://customJenkinsServer",
+        "builds": [
+            "Daily-ODM",
+            "Daily-SPECjbb2015",
+            "Daily-Liberty-DayTrader3",
+            "daily_openjdk8_j9_jcktest_ppc64le_linux",
+            "daily_openjdk8_j9_jcktest_x86-64_linux",
+            "daily_openjdk9_j9_jcktest_ppc64le_linux",
+            "daily_openjdk9_j9_jcktest_x86-64_linux"
+        ],
+        "default": [
+            "daily_openjdk8_j9_jcktest_ppc64le_linux",
+            "daily_openjdk8_j9_jcktest_x86-64_linux",
+            "daily_openjdk9_j9_jcktest_ppc64le_linux",
+            "daily_openjdk9_j9_jcktest_x86-64_linux"
+        ]
+    },
+    "OpenJ9": {
+        "url": "https://ci.eclipse.org/openj9/",
+        "builds": [
+            "Pipeline-Build-Test-All",
+            "Pipeline-Build-Test-JDK8-linux_390-64_cmprssptrs",
+            "Pipeline-Build-Test-JDK8-linux_ppc-64_cmprssptrs_le",
+            "Test-extended.functional-JDK8-aix_ppc-64_cmprssptrs",
+            "Test-extended.functional-JDK8-linux_390-64_cmprssptrs",
+            "Test-extended.functional-JDK8-linux_ppc-64_cmprssptrs_le",
+            "Test-extended.functional-JDK8-linux_x86-64",
+            "Test-extended.functional-JDK8-linux_x86-64_cmprssptrs",
+            "Test-extended.functional-JDK8-win_x86-64_cmprssptrs",
+            "Test-extended.functional-JDK10-aix_ppc-64_cmprssptrs",
+            "Test-extended.functional-JDK10-linux_390-64_cmprssptrs",
+            "Test-extended.functional-JDK10-linux_ppc-64_cmprssptrs_le",
+            "Test-extended.functional-JDK10-linux_x86-64",
+            "Test-extended.functional-JDK10-linux_x86-64_cmprssptrs",
+            "Test-extended.functional-JDK10-win_x86-64_cmprssptrs",
+            "Test-extended.system-JDK8-aix_ppc-64_cmprssptrs",
+            "Test-extended.system-JDK8-linux_390-64_cmprssptrs",
+            "Test-extended.system-JDK8-linux_ppc-64_cmprssptrs_le",
+            "Test-extended.system-JDK8-linux_x86-64",
+            "Test-extended.system-JDK8-linux_x86-64_cmprssptrs",
+            "Test-extended.system-JDK8-win_x86-64_cmprssptrs",
+            "Test-extended.system-JDK10-aix_ppc-64_cmprssptrs",
+            "Test-extended.system-JDK10-linux_390-64_cmprssptrs",
+            "Test-extended.system-JDK10-linux_ppc-64_cmprssptrs_le",
+            "Test-extended.system-JDK10-linux_x86-64",
+            "Test-extended.system-JDK10-linux_x86-64_cmprssptrs",
+            "Test-extended.system-JDK10-win_x86-64_cmprssptrs",
+            "Test-sanity.functional-JDK8-aix_ppc-64_cmprssptrs",
+            "Test-sanity.functional-JDK8-linux_390-64_cmprssptrs",
+            "Test-sanity.functional-JDK8-linux_ppc-64_cmprssptrs_le",
+            "Test-sanity.functional-JDK8-linux_x86-64",
+            "Test-sanity.functional-JDK8-linux_x86-64_cmprssptrs",
+            "Test-sanity.functional-JDK8-win_x86-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-aix_ppc-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-linux_390-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-linux_ppc-64_cmprssptrs_le",
+            "Test-sanity.functional-JDK10-linux_x86-64",
+            "Test-sanity.functional-JDK10-linux_x86-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-win_x86-64_cmprssptrs",
+            "Test-sanity.system-JDK8-aix_ppc-64_cmprssptrs",
+            "Test-sanity.system-JDK8-linux_390-64_cmprssptrs",
+            "Test-sanity.system-JDK8-linux_ppc-64_cmprssptrs_le",
+            "Test-sanity.system-JDK8-linux_x86-64",
+            "Test-sanity.system-JDK8-linux_x86-64_cmprssptrs",
+            "Test-sanity.system-JDK8-win_x86-64_cmprssptrs",
+            "Test-sanity.system-JDK10-aix_ppc-64_cmprssptrs",
+            "Test-sanity.system-JDK10-linux_390-64_cmprssptrs",
+            "Test-sanity.system-JDK10-linux_ppc-64_cmprssptrs_le",
+            "Test-sanity.system-JDK10-linux_x86-64",
+            "Test-sanity.system-JDK10-linux_x86-64_cmprssptrs",
+            "Test-sanity.system-JDK10-win_x86-64_cmprssptrs"
+        ],
+        "default": [
+            "Pipeline-Build-Test-All",
+            "Test-sanity.functional-JDK8-aix_ppc-64_cmprssptrs",
+            "Test-sanity.functional-JDK8-linux_390-64_cmprssptrs",
+            "Test-sanity.functional-JDK8-linux_ppc-64_cmprssptrs_le",
+            "Test-sanity.functional-JDK8-linux_x86-64",
+            "Test-sanity.functional-JDK8-linux_x86-64_cmprssptrs",
+            "Test-sanity.functional-JDK8-win_x86-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-aix_ppc-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-linux_390-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-linux_ppc-64_cmprssptrs_le",
+            "Test-sanity.functional-JDK10-linux_x86-64",
+            "Test-sanity.functional-JDK10-linux_x86-64_cmprssptrs",
+            "Test-sanity.functional-JDK10-win_x86-64_cmprssptrs"
+        ]
+    },
+    "AdoptOpenJDK": {
+        "url": "https://ci.adoptopenjdk.net/",
+        "builds": [
+            "openjdk8_hs_openjdktest_x86-64_linux",
+            "openjdk8_hs_openjdktest_x86-64_macos",
+            "openjdk8_j9_openjdktest_x86-64_linux",
+            "openjdk10_hs_openjdktest_aarch64_linux",
+            "openjdk10_hs_openjdktest_x86-64_linux",
+            "openjdk10_j9_openjdktest_x86-64_linux",
+            "openjdk10_hs_systemtest_ppc64le_linux",
+            "openjdk10_hs_systemtest_x86-64_linux"
+        ],
+        "default": [
+            "openjdk8_j9_openjdktest_x86-64_linux",
+            "openjdk8_hs_openjdktest_x86-64_linux",
+            "openjdk10_hs_openjdktest_x86-64_linux",
+            "openjdk10_j9_openjdktest_x86-64_linux"
+        ]
+    }
+}
diff --git a/TestResultSummaryService/routes/getDashboardBuildInfo.js b/TestResultSummaryService/routes/getDashboardBuildInfo.js
@@ -0,0 +1,6 @@
+const fs = require("fs");
+module.exports = async (req, res) => {
+    const content = fs.readFileSync(__dirname + "/../DashboardBuildInfo.json");
+    const jsonContent = JSON.parse(content);
+    res.send(jsonContent);
+}
diff --git a/TestResultSummaryService/routes/index.js b/TestResultSummaryService/routes/index.js
@@ -10,6 +10,7 @@ app.get( '/getAllTestsWithHistory', wrap( require( "./getAllTestsWithHistory" )
 app.get( '/getBuildHistory', wrap( require( "./getBuildHistory" ) ) );
 app.get( '/getBuildList', wrap( require( "./getBuildList" ) ) );
 app.get( '/getChildBuilds', wrap( require( "./getChildBuilds" ) ) );
+app.get( '/getDashboardBuildInfo', wrap( require( "./getDashboardBuildInfo" ) ) );
 app.get( '/getData', wrap( require( "./getData" ) ) );
 app.get( '/getHistoryPerTest', wrap( require( "./getHistoryPerTest" ) ) );
 app.get( '/getLastBuildInfo', wrap( require( "./getLastBuildInfo" ) ) );

diff --git a/test-result-summary-client/src/Dashboard/Defaults.js b/test-result-summary-client/src/Dashboard/Defaults.js
@@ -6,23 +6,25 @@ export default {
                 x: 0,
                 y: 0,
                 settings: {
-                    serverSelected: 'InternalJenkins'
+                    serverSelected: 'AdoptOpenJDK',
+                    title: "https://ci.adoptopenjdk.net/",
                 }
             },
             {
                 type: 'BuildStatus',
                 x: 0,
                 y: 1,
                 settings: {
-                    serverSelected: 'OpenJ9'
+                    serverSelected: 'OpenJ9',
+                    title: "https://ci.eclipse.org/openj9/",
                 }
             },
             {
                 type: 'BuildStatus',
                 x: 0,
                 y: 2,
                 settings: {
-                    serverSelected: 'AdoptOpenJDK'
+                    serverSelected: 'CustomJenkins',
                 }
             }
         ]

diff --git a/test-result-summary-client/src/Dashboard/TabInfo.jsx b/test-result-summary-client/src/Dashboard/TabInfo.jsx
@@ -9,7 +9,7 @@ import "./dashboard.css";
 const ReactGridLayout = WidthProvider( RGL );
 
 export default class TabInfo extends Component {
-    static VERSION = 4;
+    static VERSION = 6;
     constructor( props ) {
         super( props );
         const localKey = `dashboard-${props.tab}`;