Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
16 changes: 15 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
executor: << parameters.os >>-<< parameters.install-type >>
environment:
COMPOSER_ALLOW_SUPERUSER: 1
XDMOD_REALMS: 'jobs,storage,cloud,resourcespecifications'
XDMOD_REALMS: 'jobs,storage,cloud,resourcespecifications,ondemand'
XDMOD_IS_CORE: 'yes'
XDMOD_INSTALL_DIR: /xdmod
XDMOD_TEST_MODE: << parameters.install-type >>
Expand Down Expand Up @@ -84,8 +84,22 @@ jobs:
- run:
name: Ingest OnDemand logs
command: ./tests/scripts/bootstrap.sh
- run:
name: Install PHPUnit
command: composer install -d $XDMOD_SRC_DIR --no-progress
- run:
name: Run Regression Tests
command: ./tests/regression/runtests.sh --junit-output-dir ~/phpunit
- run:
name: Ensure that no PHP command-line errors were generated
command: >
if [ -e /var/log/php_errors.log ]; then
test `fgrep -v 'vendor/phpunit/phpunit/src' /var/log/php_errors.log | wc -l` = 0;
fi
- store_artifacts:
path: /var/log/xdmod
- store_artifacts:
path: /var/log/php_errors.log
test-export-tool:
parameters:
os:
Expand Down
110 changes: 110 additions & 0 deletions tests/artifacts/regression/chartFilterTests.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
[
{
"settings": {
"realm": "OnDemand",
"metric": "sessions_per_user",
"date": "2021-01-12",
"filter_dimension": "browser",
"filter_values": [
"Chrome",
"Firefox"
]
},
"expected": {
"subtitle": "Browser = ( Chrome, Firefox )",
"yvalue": 3
}
},
{
"settings": {
"realm": "OnDemand",
"metric": "sessions_per_user",
"date": "2021-01-12",
"filter_dimension": "location",
"filter_values": [
"Unknown"
]
},
"expected": {
"subtitle": "Location = Unknown",
"yvalue": 3
}
},
{
"settings": {
"realm": "OnDemand",
"metric": "sessions_per_user",
"date": "2021-01-12",
"filter_dimension": "oodapplication",
"filter_values": [
"sys/bc_desktop/hpc (sys/ihpc)",
"sys/dashboard"
]
},
"expected": {
"subtitle": "OnDemand Application = ( sys/bc_desktop/hpc (sys/ihpc), sys/dashboard )",
"yvalue": 1.5
}
},
{
"settings": {
"realm": "OnDemand",
"metric": "sessions_per_user",
"date": "2021-01-12",
"filter_dimension": "ooduser",
"filter_values": [
"hpcadmin",
"sfoster"
]
},
"expected": {
"subtitle": "OnDemand Username = ( hpcadmin, sfoster )",
"yvalue": 3
}
},
{
"settings": {
"realm": "OnDemand",
"metric": "sessions_per_user",
"date": "2021-01-12",
"filter_dimension": "operatingsys",
"filter_values": [
"Mac OS X"
]
},
"expected": {
"subtitle": "Operating System = Mac OS X",
"yvalue": 3
}
},
{
"settings": {
"realm": "OnDemand",
"metric": "sessions_per_user",
"date": "2021-01-12",
"filter_dimension": "resource",
"filter_values": [
"styx"
]
},
"expected": {
"subtitle": "Resource = styx",
"yvalue": 3
}
},
{
"settings": {
"realm": "OnDemand",
"metric": "sessions_per_user",
"date": "2021-01-12",
"filter_dimension": "person",
"filter_values": [
"Unknown"
]
},
"expected": {
"subtitle": "User = Unknown",
"yvalue": 3
}
}
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Apps: Active"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Apps: Active"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Apps: Active"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Apps: Active"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Day,"[Chrome] Number of Apps: Active","[Firefox] Number of Apps: Active"
2021-01-12,4,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Month,"[Chrome] Number of Apps: Active","[Firefox] Number of Apps: Active"
2021-01,4,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Quarter,"[Chrome] Number of Apps: Active","[Firefox] Number of Apps: Active"
"2021 Q1",4,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Apps: Active: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Year,"[Chrome] Number of Apps: Active","[Firefox] Number of Apps: Active"
2021,4,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Page Loads"
Chrome,592
Firefox,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Page Loads"
Chrome,592
Firefox,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Page Loads"
Chrome,592
Firefox,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Page Loads"
Chrome,592
Firefox,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Day,"[Chrome] Number of Page Loads","[Firefox] Number of Page Loads"
2021-01-12,592,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Month,"[Chrome] Number of Page Loads","[Firefox] Number of Page Loads"
2021-01,592,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Quarter,"[Chrome] Number of Page Loads","[Firefox] Number of Page Loads"
"2021 Q1",592,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Page Loads: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Year,"[Chrome] Number of Page Loads","[Firefox] Number of Page Loads"
2021,592,542
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Sessions: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Sessions"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Sessions: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Sessions"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Sessions: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Sessions"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
title
"Number of Sessions: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Browser,"Number of Sessions"
Chrome,4
Firefox,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Sessions: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Day,"[Chrome] Number of Sessions","[Firefox] Number of Sessions"
2021-01-12,4,2
---------
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
title
"Number of Sessions: by Browser"
parameters

start,end
2021-01-12,2021-01-12
---------
Month,"[Chrome] Number of Sessions","[Firefox] Number of Sessions"
2021-01,4,2
---------
Loading