From 008f85bb0f68e9c92dcf36afba6ccd28613d6ad5 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Mon, 25 Jul 2022 08:37:41 -0700 Subject: [PATCH 01/29] update documentation --- README.md | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 1725a80..f937240 100644 --- a/README.md +++ b/README.md @@ -1 +1,46 @@ -# psi-j-testing-service \ No newline at end of file +# psi-j-testing-service + +# make virtual environment +virtualvenv psi +source psi/bin/activate + +# install some things. + +pip3 install -r requirements.txt + +cd ~/psi-j-testing-service/src/psij/testing +python3 service.py + +# you will need mongoDB, follow the instructions here, it takes a while to install. +https://www.mongodb.com/docs/manual/tutorial/install-mongodb-on-os-x/ + +the last step is: +brew services start mongodb-community@6.0 + + +This starts the service witch allows things to run locally: +cd ~/psi-j-testing-service; +python3 src/psij/testing/service.py + +then you can see it at this url: +http://0.0.0.0:9909/summary.html + + + +To populate the data i need to run psi-j-python: +you need to edit testing.conf first and, at a minimum, update the url to point to your server +server_url = http://0.0.0.0:9909 + +~/psi-j-python: pip3 install -r requirements-dev.txt +~/psi-j-python: make tests -- --upload-results + + +At LLNL, you will get this error: requests.exceptions.SSLError: HTTPSConnectionPool(host='testing.exaworks.org', port=443): Max retries exceeded with url: /result (Caused by SSLError(SSLCertVerificationError(1, '[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: self signed certificate in certificate chain (_ssl.c:1056)'))) +make: *** [tests] Error 1 + +the firewall basically does a MITM certificate switch +I don't remember the exact incantation, but you have to convince python to trust the root that signed the LLNL cert + + + + From 7243e79f63ff31d323b165307063621ef8dcccaf Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Mon, 25 Jul 2022 13:52:41 -0700 Subject: [PATCH 02/29] Fix customization.js, instance directory was not accessible by cherry framework. but sister directories are, despite having exactly the same permissions --- src/psij/web/js/customization.js | 3 +++ src/psij/web/lib.js | 3 +++ src/psij/web/run.html | 2 +- src/psij/web/site.html | 2 +- src/psij/web/summary.html | 2 +- 5 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 src/psij/web/js/customization.js diff --git a/src/psij/web/js/customization.js b/src/psij/web/js/customization.js new file mode 100644 index 0000000..a0b55df --- /dev/null +++ b/src/psij/web/js/customization.js @@ -0,0 +1,3 @@ +CUSTOMIZATION = { + projectName: "PSI/J" +} \ No newline at end of file diff --git a/src/psij/web/lib.js b/src/psij/web/lib.js index d81417c..19f0e48 100644 --- a/src/psij/web/lib.js +++ b/src/psij/web/lib.js @@ -1,3 +1,6 @@ +// lib.js +var lib_test = 5; + var badness = function(obj) { if (obj['failed_count'] > 0) { if (obj['completed_count'] < obj['failed_count']) { diff --git a/src/psij/web/run.html b/src/psij/web/run.html index 36e5be2..a17ebe6 100644 --- a/src/psij/web/run.html +++ b/src/psij/web/run.html @@ -13,7 +13,7 @@ - +
diff --git a/src/psij/web/site.html b/src/psij/web/site.html index aac4294..51672ad 100644 --- a/src/psij/web/site.html +++ b/src/psij/web/site.html @@ -13,7 +13,7 @@ - +
diff --git a/src/psij/web/summary.html b/src/psij/web/summary.html index 902b0ca..27c2661 100644 --- a/src/psij/web/summary.html +++ b/src/psij/web/summary.html @@ -15,7 +15,7 @@ - +
From 48a9532ee71b2840395d1ba215c18a9b9271bb28 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Tue, 26 Jul 2022 12:53:12 -0700 Subject: [PATCH 03/29] style buttons and tabs --- src/psij/web/lib.js | 17 +++++++++++++++++ src/psij/web/style.css | 32 +++++++++++++++++++------------- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/src/psij/web/lib.js b/src/psij/web/lib.js index 19f0e48..7fcde18 100644 --- a/src/psij/web/lib.js +++ b/src/psij/web/lib.js @@ -1,6 +1,23 @@ // lib.js var lib_test = 5; +// DEBUG: +setInterval( function() { + if( !window.mouseHasMoved ) { + // location.reload(); + } +}, 3000); + +window.addEventListener('mousemove', function() { + console.log('move'); + window.mouseHasMoved = 1; +}); + +$(window).focus(function(e) { + // Do Focus Actions Here + //location.reload(); +}); + var badness = function(obj) { if (obj['failed_count'] > 0) { if (obj['completed_count'] < obj['failed_count']) { diff --git a/src/psij/web/style.css b/src/psij/web/style.css index abf27f2..e267ab6 100644 --- a/src/psij/web/style.css +++ b/src/psij/web/style.css @@ -1,5 +1,5 @@ body { - background-color: #f0f0f0; + background-color: #ffffff; font-family: "open sans", Helvetica, sans; } @@ -8,7 +8,6 @@ body { } #container { - margin: 8pt; max-width: 700pt; margin-left: auto; margin-right: auto; @@ -70,10 +69,6 @@ body { height: 16pt; } -.highlightable:hover { - box-shadow: 1pt 1pt 5pt #80a0ff !important; -} - .clickable { cursor: pointer; } @@ -146,6 +141,10 @@ body { width: 100%; text-align: right; margin-bottom: 32pt; + background-color: #2d3436; + background-image: linear-gradient(180deg, #4d5456 0%, #000000 74%); + padding: 8px 0 0 0; + height: 45px; } #toolbar .spacer { @@ -178,14 +177,21 @@ body { #toolbar .button { display: inline-block; - box-shadow: 1pt 1pt 3pt #606060; cursor: pointer; - background-color: #ffffff; - padding: 3pt; -} - -.button.selected { - background-color: #d0e0ff !important; + background-color: #b2b2b2; + padding: 5px 9px 6px 9px; + border-top: 1px solid black; + border-left: 1px solid black; + border-right: 1px solid black; + border-bottom: 1px solid black; + margin: 0 5px 0 0; + border-top-right-radius: 5px; + border-top-left-radius: 5px; +} + +#toolbar .button.selected { + background-color: #ffffff !important; + border-bottom: 1px solid white; } .branch-heading { From 165010944fe42b773c5fba1dc0b3b2815ee92b36 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Wed, 27 Jul 2022 15:24:47 -0700 Subject: [PATCH 04/29] breadcrumb styling to give it a more clean and professional look --- src/psij/web/style.css | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/src/psij/web/style.css b/src/psij/web/style.css index e267ab6..17bfbb7 100644 --- a/src/psij/web/style.css +++ b/src/psij/web/style.css @@ -153,25 +153,35 @@ body { } #breadcrumbs { - float: left; + position: absolute; + top: 16px; + background-color: #444444; + border: 1px solid #666666; +} + +#breadcrumbs .v-breadcrumbs__divider { + color: white; } #breadcrumbs .v-breadcrumbs { margin: 0pt; - padding-bottom: 4pt; - padding-top: 4pt; + padding-bottom: 0; + padding-top: 0; } #breadcrumbs li:not(.v-breadcrumbs__divider) { display: inline-block; - box-shadow: 1pt 1pt 3pt #606060; cursor: pointer; - background-color: #ffffff; padding: 4pt; + color: white; +} + +#breadcrumbs a:visited { + color: white; } #breadcrumbs li:hover:not(.v-breadcrumbs__divider) { - box-shadow: 1pt 1pt 5pt #80a0ff !important; + color: white; } From 0ffb5819d908b3e43c334fa261f4215245bf3f1c Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Wed, 3 Aug 2022 11:41:36 -0700 Subject: [PATCH 05/29] merge --- src/psij/web/style.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/psij/web/style.css b/src/psij/web/style.css index 17bfbb7..9cc87f1 100644 --- a/src/psij/web/style.css +++ b/src/psij/web/style.css @@ -305,7 +305,6 @@ body { #run-table th, #run-table td { padding: 6pt; - padding-right } td.run-id { From 08aa9f32f954172a3036d405b31408e267083213 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Wed, 3 Aug 2022 11:33:22 -0700 Subject: [PATCH 06/29] add styling for the main summary table --- src/psij/web/style.css | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/psij/web/style.css b/src/psij/web/style.css index 9cc87f1..7c90c4a 100644 --- a/src/psij/web/style.css +++ b/src/psij/web/style.css @@ -478,6 +478,8 @@ td.run-id { #status-calendar table { position: relative; + width:100%; + border-spacing: 0; } #status-calendar table tr:first-child th { @@ -485,10 +487,27 @@ td.run-id { top: 0pt; } +#status-calendar tr:first-child th { + background-color: #666666; + color: white; + font-weight: bold; +} + +#status-calendar tr td, tr th { + background-color: #e2e2e2; + border-bottom: 1px solid #cfcfcf; +} + +#status-calendar tr:nth-child(even) td, +tr:nth-child(even) th { + background-color: #f2f2f2; +} + .calendar-month { height: 14pt; font-weight: normal; - font-size: 11pt; + font-size: 9pt; + padding-top: 5px; width: 60pt; } @@ -497,8 +516,6 @@ td.run-id { font-weight: normal; font-size: 11pt; padding-bottom: 4pt; - border-bottom: 2pt solid #e0e0e0; - margin-bottom: 2pt; } .calendar-site { @@ -507,7 +524,6 @@ td.run-id { font-size: 11pt; height: 24pt; padding: 4pt; - border-radius: 4pt; } .calendar-tile { From 552f594a1d8be641a3f41b0d391056ace897e1bc Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Wed, 3 Aug 2022 11:34:43 -0700 Subject: [PATCH 07/29] debug assistance for resp object --- src/psij/testing/service.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/psij/testing/service.py b/src/psij/testing/service.py index adcaabb..b6d841b 100644 --- a/src/psij/testing/service.py +++ b/src/psij/testing/service.py @@ -307,6 +307,10 @@ def summary(self, inactiveTimeout: str = "10") -> object: date_start = date_start + datetime.timedelta(days=-1) + #return [resp[0], resp[0], resp[0]] + DEBUG_RESP = '[{"site_id": "Hategan\'s laptop", "run_id": "2022080310-8bdc484df8187c8040212002a96e4a1e5cf9f521755a18296989109670f0804d", "branches": [{"name": "main", "completed_count": 1, "failed_count": 0, "running": true}], "running": true, "completed_count": 1, "failed_count": 0, "months": {"8": {"3": {"completed_count": 1, "failed_count": 0, "branches": [{"completed_count": 1, "failed_count": 0, "name": "main"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "axis1.hidden.uoregon.edu", "run_id": "2022080218-00414fb4d08c0f090e951356391d6b522432fbee1d539dfc6af191924e32c0a7", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 107, "failed_count": 16, "branches": [{"completed_count": 107, "failed_count": 16, "name": "main"}]}, "28": {"completed_count": 107, "failed_count": 16, "branches": [{"completed_count": 107, "failed_count": 16, "name": "main"}]}, "27": {"completed_count": 107, "failed_count": 16, "branches": [{"completed_count": 107, "failed_count": 16, "name": "main"}]}}}}, {"site_id": "cori08.nersc.gov", "run_id": "2022080209-47b1d88914dd1da61417d8c446e7312f8a9a21749bfcbfc050f1e5121596c31a", "branches": [{"name": "add_str_to_job_attributes", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 6, "failed_count": 0, "months": {"8": {"3": {"completed_count": 0, "failed_count": 0, "branches": []}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 87, "failed_count": 14, "branches": [{"completed_count": 87, "failed_count": 14, "name": "main"}]}, "28": {"completed_count": 261, "failed_count": 42, "branches": [{"completed_count": 87, "failed_count": 14, "name": "deploy_scripts"}, {"completed_count": 87, "failed_count": 14, "name": "main"}, {"completed_count": 87, "failed_count": 14, "name": "setup_version_info"}]}, "27": {"completed_count": 87, "failed_count": 14, "branches": [{"completed_count": 87, "failed_count": 14, "name": "main"}]}}}}, {"site_id": "doc.llnl.gov", "run_id": "2022072514-476f115745cf9c28b255db4d01c1b90afce3fd1ab3526a1b579a62064ffead3b", "branches": [{"name": "main", "completed_count": 40, "failed_count": 28, "running": false}], "running": false, "completed_count": 40, "failed_count": 28, "months": {"8": {"3": {"completed_count": 0, "failed_count": 0, "branches": []}, "2": {"completed_count": 0, "failed_count": 0, "branches": []}, "1": {"completed_count": 0, "failed_count": 0, "branches": []}}, "7": {"31": {"completed_count": 0, "failed_count": 0, "branches": []}, "30": {"completed_count": 0, "failed_count": 0, "branches": []}, "29": {"completed_count": 0, "failed_count": 0, "branches": []}, "28": {"completed_count": 0, "failed_count": 0, "branches": []}, "27": {"completed_count": 0, "failed_count": 0, "branches": []}}}}, {"site_id": "illyad.hidden.uoregon.edu", "run_id": "2022080219-9c4f6289e5a90e41a0378b4e3884cffc0620007b6471e302f9bcad695a7934bc", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "jupiter.hidden.uoregon.edu", "run_id": "2022080307-6ae90668e9210e032d35a7ca6c2d02f6d8cff2143dac2355178164fd86d38f17", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "mothra.hidden.uoregon.edu", "run_id": "2022080217-6ad22fb3069aca9a415405287953646e2947455e910c9533b2cfc13b38e3c82a", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 59, "failed_count": 9, "branches": [{"completed_count": 59, "failed_count": 9, "name": "main"}]}, "28": {"completed_count": 59, "failed_count": 9, "branches": [{"completed_count": 59, "failed_count": 9, "name": "main"}]}, "27": {"completed_count": 59, "failed_count": 9, "branches": [{"completed_count": 59, "failed_count": 9, "name": "main"}]}}}}, {"site_id": "orthus.nic.uoregon.edu", "run_id": "2022080306-34839c604f5669a85ba23cc2b629d40d68a48220cd1c795282ad4ebf8f9be0cb", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "reptar.hidden.uoregon.edu", "run_id": "2022080218-df08ff0eadd112d3548def686b7ef0b671dc3579dd39126e3c36de02a56106a3", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "saturn.hidden.uoregon.edu", "run_id": "2022080301-5830a4c6f6770f8b1835576edb353ebe18783966156e831b5f09e0be7b4aff2e", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}]' + import json + #return json.loads(DEBUG_RESP) return resp @cherrypy.expose From ee7795f994b06922120cc9604c803f3233dfe8d5 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Wed, 3 Aug 2022 11:49:17 -0700 Subject: [PATCH 08/29] testing commit --- src/psij/web/lib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/psij/web/lib.js b/src/psij/web/lib.js index 7fcde18..5102ce7 100644 --- a/src/psij/web/lib.js +++ b/src/psij/web/lib.js @@ -1,5 +1,5 @@ // lib.js -var lib_test = 5; +var lib_test = 6; // DEBUG: setInterval( function() { From 78e0e51f35c2f73676af4f1bc191243316e293d1 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Wed, 3 Aug 2022 16:36:49 -0700 Subject: [PATCH 09/29] Add configurations for curated sight and intro blurbs --- src/psij/web/js/customization.js | 38 +++++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/src/psij/web/js/customization.js b/src/psij/web/js/customization.js index a0b55df..3f2e8c8 100644 --- a/src/psij/web/js/customization.js +++ b/src/psij/web/js/customization.js @@ -1,3 +1,39 @@ CUSTOMIZATION = { projectName: "PSI/J" -} \ No newline at end of file +} + +var CONF = { + STR: { + "title": "PSI/J Dashboard", + "sub_title": "Exascale dashboard testing service", + "intro_blurb": "The dashboard testing service shows you the status of various sites by date or by lab.", + "outro_blurb": "Dashboard outro. The outro will also be roughly one paragraph long." + }, + "curated_sights": { + xaxis: [ + "PSI/J", + "PSI/J + Parsl", + "PSI/J + Swift", + "RADICAL-Pilot" + ], + yaxis: [ + { + logo_src: "", + logo_name: "" + }, + { + logo_src: "", + logo_name: "" + }, + { + logo_src: "", + logo_name: "" + }, + { + logo_src: "", + logo_name: "" + } + ] + } +}; + From 53c7db382084a7f5c5c8da772645397ece31c4e0 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Thu, 4 Aug 2022 08:38:56 -0700 Subject: [PATCH 10/29] added new home tab for new curate sites page --- src/psij/web/js/customization.js | 4 ++-- src/psij/web/summary.html | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/psij/web/js/customization.js b/src/psij/web/js/customization.js index 3f2e8c8..f9809b7 100644 --- a/src/psij/web/js/customization.js +++ b/src/psij/web/js/customization.js @@ -4,12 +4,12 @@ CUSTOMIZATION = { var CONF = { STR: { - "title": "PSI/J Dashboard", + "title": CUSTOMIZATION.projectName, "sub_title": "Exascale dashboard testing service", "intro_blurb": "The dashboard testing service shows you the status of various sites by date or by lab.", "outro_blurb": "Dashboard outro. The outro will also be roughly one paragraph long." }, - "curated_sights": { + "curated_sites": { xaxis: [ "PSI/J", "PSI/J + Parsl", diff --git a/src/psij/web/summary.html b/src/psij/web/summary.html index 27c2661..819179c 100644 --- a/src/psij/web/summary.html +++ b/src/psij/web/summary.html @@ -23,6 +23,9 @@
+
+ home +
calendar_today
From 60b7defb302d184aef3449acc39f951c2dc091f5 Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Thu, 4 Aug 2022 12:46:21 -0700 Subject: [PATCH 11/29] update mongoDB restore documentation --- README.md | 10 ++++++---- src/psij/testing/service.py | 4 ---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f937240..37d8145 100644 --- a/README.md +++ b/README.md @@ -35,12 +35,14 @@ server_url = http://0.0.0.0:9909 ~/psi-j-python: make tests -- --upload-results -At LLNL, you will get this error: requests.exceptions.SSLError: HTTPSConnectionPool(host='testing.exaworks.org', port=443): Max retries exceeded with url: /result (Caused by SSLError(SSLCertVerificationError(1, '[SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: self signed certificate in certificate chain (_ssl.c:1056)'))) -make: *** [tests] Error 1 +Restoring a mongodump DB: +You'll want to get a full dump, that way you can play with the data: -the firewall basically does a MITM certificate switch -I don't remember the exact incantation, but you have to convince python to trust the root that signed the LLNL cert +First untar these: +mongodump-psij.tar +mongodump-sdk.tar.gz +mongorestore dump/ diff --git a/src/psij/testing/service.py b/src/psij/testing/service.py index b6d841b..adcaabb 100644 --- a/src/psij/testing/service.py +++ b/src/psij/testing/service.py @@ -307,10 +307,6 @@ def summary(self, inactiveTimeout: str = "10") -> object: date_start = date_start + datetime.timedelta(days=-1) - #return [resp[0], resp[0], resp[0]] - DEBUG_RESP = '[{"site_id": "Hategan\'s laptop", "run_id": "2022080310-8bdc484df8187c8040212002a96e4a1e5cf9f521755a18296989109670f0804d", "branches": [{"name": "main", "completed_count": 1, "failed_count": 0, "running": true}], "running": true, "completed_count": 1, "failed_count": 0, "months": {"8": {"3": {"completed_count": 1, "failed_count": 0, "branches": [{"completed_count": 1, "failed_count": 0, "name": "main"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "axis1.hidden.uoregon.edu", "run_id": "2022080218-00414fb4d08c0f090e951356391d6b522432fbee1d539dfc6af191924e32c0a7", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 107, "failed_count": 16, "branches": [{"completed_count": 107, "failed_count": 16, "name": "main"}]}, "28": {"completed_count": 107, "failed_count": 16, "branches": [{"completed_count": 107, "failed_count": 16, "name": "main"}]}, "27": {"completed_count": 107, "failed_count": 16, "branches": [{"completed_count": 107, "failed_count": 16, "name": "main"}]}}}}, {"site_id": "cori08.nersc.gov", "run_id": "2022080209-47b1d88914dd1da61417d8c446e7312f8a9a21749bfcbfc050f1e5121596c31a", "branches": [{"name": "add_str_to_job_attributes", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 6, "failed_count": 0, "months": {"8": {"3": {"completed_count": 0, "failed_count": 0, "branches": []}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 87, "failed_count": 14, "branches": [{"completed_count": 87, "failed_count": 14, "name": "main"}]}, "28": {"completed_count": 261, "failed_count": 42, "branches": [{"completed_count": 87, "failed_count": 14, "name": "deploy_scripts"}, {"completed_count": 87, "failed_count": 14, "name": "main"}, {"completed_count": 87, "failed_count": 14, "name": "setup_version_info"}]}, "27": {"completed_count": 87, "failed_count": 14, "branches": [{"completed_count": 87, "failed_count": 14, "name": "main"}]}}}}, {"site_id": "doc.llnl.gov", "run_id": "2022072514-476f115745cf9c28b255db4d01c1b90afce3fd1ab3526a1b579a62064ffead3b", "branches": [{"name": "main", "completed_count": 40, "failed_count": 28, "running": false}], "running": false, "completed_count": 40, "failed_count": 28, "months": {"8": {"3": {"completed_count": 0, "failed_count": 0, "branches": []}, "2": {"completed_count": 0, "failed_count": 0, "branches": []}, "1": {"completed_count": 0, "failed_count": 0, "branches": []}}, "7": {"31": {"completed_count": 0, "failed_count": 0, "branches": []}, "30": {"completed_count": 0, "failed_count": 0, "branches": []}, "29": {"completed_count": 0, "failed_count": 0, "branches": []}, "28": {"completed_count": 0, "failed_count": 0, "branches": []}, "27": {"completed_count": 0, "failed_count": 0, "branches": []}}}}, {"site_id": "illyad.hidden.uoregon.edu", "run_id": "2022080219-9c4f6289e5a90e41a0378b4e3884cffc0620007b6471e302f9bcad695a7934bc", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "jupiter.hidden.uoregon.edu", "run_id": "2022080307-6ae90668e9210e032d35a7ca6c2d02f6d8cff2143dac2355178164fd86d38f17", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "mothra.hidden.uoregon.edu", "run_id": "2022080217-6ad22fb3069aca9a415405287953646e2947455e910c9533b2cfc13b38e3c82a", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 59, "failed_count": 9, "branches": [{"completed_count": 59, "failed_count": 9, "name": "main"}]}, "28": {"completed_count": 59, "failed_count": 9, "branches": [{"completed_count": 59, "failed_count": 9, "name": "main"}]}, "27": {"completed_count": 59, "failed_count": 9, "branches": [{"completed_count": 59, "failed_count": 9, "name": "main"}]}}}}, {"site_id": "orthus.nic.uoregon.edu", "run_id": "2022080306-34839c604f5669a85ba23cc2b629d40d68a48220cd1c795282ad4ebf8f9be0cb", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "reptar.hidden.uoregon.edu", "run_id": "2022080218-df08ff0eadd112d3548def686b7ef0b671dc3579dd39126e3c36de02a56106a3", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}, {"site_id": "saturn.hidden.uoregon.edu", "run_id": "2022080301-5830a4c6f6770f8b1835576edb353ebe18783966156e831b5f09e0be7b4aff2e", "branches": [{"name": "main", "completed_count": 2, "failed_count": 0, "running": false}, {"name": "minimal_test_uploads", "completed_count": 2, "failed_count": 0, "running": false}], "running": false, "completed_count": 4, "failed_count": 0, "months": {"8": {"3": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "2": {"completed_count": 6, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "add_str_to_job_attributes"}, {"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "minimal_test_uploads"}]}, "1": {"completed_count": 4, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}, {"completed_count": 2, "failed_count": 0, "name": "test_git_branch_fix"}]}}, "7": {"31": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "30": {"completed_count": 2, "failed_count": 0, "branches": [{"completed_count": 2, "failed_count": 0, "name": "main"}]}, "29": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}, "28": {"completed_count": 237, "failed_count": 33, "branches": [{"completed_count": 79, "failed_count": 11, "name": "deploy_scripts"}, {"completed_count": 79, "failed_count": 11, "name": "main"}, {"completed_count": 79, "failed_count": 11, "name": "setup_version_info"}]}, "27": {"completed_count": 79, "failed_count": 11, "branches": [{"completed_count": 79, "failed_count": 11, "name": "main"}]}}}}]' - import json - #return json.loads(DEBUG_RESP) return resp @cherrypy.expose From 6c3ae41646beb557a86b3b4766bfb6f1b869b32d Mon Sep 17 00:00:00 2001 From: Pascal Aschwanden Date: Thu, 4 Aug 2022 13:15:52 -0700 Subject: [PATCH 12/29] Dashboard title styling and CSS in header, as well as making it configurable from CONF. Plus put style.css in css directory and update links. --- src/psij/web/{ => css}/style.css | 20 ++++++++++++++++---- src/psij/web/js/customization.js | 3 +-- src/psij/web/run.html | 2 +- src/psij/web/site.html | 2 +- src/psij/web/summary.html | 8 ++++++-- 5 files changed, 25 insertions(+), 10 deletions(-) rename src/psij/web/{ => css}/style.css (97%) diff --git a/src/psij/web/style.css b/src/psij/web/css/style.css similarity index 97% rename from src/psij/web/style.css rename to src/psij/web/css/style.css index 7c90c4a..955372b 100644 --- a/src/psij/web/style.css +++ b/src/psij/web/css/style.css @@ -143,8 +143,8 @@ body { margin-bottom: 32pt; background-color: #2d3436; background-image: linear-gradient(180deg, #4d5456 0%, #000000 74%); - padding: 8px 0 0 0; - height: 45px; + padding: 15px 0 0 0; + height: 52px; } #toolbar .spacer { @@ -154,7 +154,7 @@ body { #breadcrumbs { position: absolute; - top: 16px; + top: 33px; background-color: #444444; border: 1px solid #666666; } @@ -172,10 +172,14 @@ body { #breadcrumbs li:not(.v-breadcrumbs__divider) { display: inline-block; cursor: pointer; - padding: 4pt; + padding: 1pt; color: white; } +#breadcrumbs li { + font-size: 12px; +} + #breadcrumbs a:visited { color: white; } @@ -184,6 +188,14 @@ body { color: white; } +.dashboard-title { + position: absolute; + left: 15px; + top: 6px; + color: #d0d0d0; + font-size: 14px; + font-weight: bold; +} #toolbar .button { display: inline-block; diff --git a/src/psij/web/js/customization.js b/src/psij/web/js/customization.js index f9809b7..2937c5d 100644 --- a/src/psij/web/js/customization.js +++ b/src/psij/web/js/customization.js @@ -4,8 +4,7 @@ CUSTOMIZATION = { var CONF = { STR: { - "title": CUSTOMIZATION.projectName, - "sub_title": "Exascale dashboard testing service", + "dashboardTitle": "Exascale dashboard testing service", "intro_blurb": "The dashboard testing service shows you the status of various sites by date or by lab.", "outro_blurb": "Dashboard outro. The outro will also be roughly one paragraph long." }, diff --git a/src/psij/web/run.html b/src/psij/web/run.html index a17ebe6..17631f2 100644 --- a/src/psij/web/run.html +++ b/src/psij/web/run.html @@ -9,7 +9,7 @@ - + diff --git a/src/psij/web/site.html b/src/psij/web/site.html index 51672ad..c39f428 100644 --- a/src/psij/web/site.html +++ b/src/psij/web/site.html @@ -9,7 +9,7 @@ - + diff --git a/src/psij/web/summary.html b/src/psij/web/summary.html index 819179c..1d238d1 100644 --- a/src/psij/web/summary.html +++ b/src/psij/web/summary.html @@ -11,7 +11,7 @@ - + @@ -36,6 +36,9 @@ table_view
 
+ +
{{ dashboardTitle }}
+