Skip to content
Open
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
^R/secure.global.ranking.md$
^_pkgdown\.yml$
^docs$
^dsBase_6.3.5.tar.gz$
^dsBase_6.3.5-permissive.tar.gz$
^dsBase_6.3.6.tar.gz$
^dsBase_6.3.6-permissive.tar.gz$
^dsDanger_6.3.4.tar.gz$
^\.circleci$
^\.circleci/config\.yml$
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dsBaseClient_test_suite.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ jobs:
- name: Install dsBase to Armadillo
run: |
curl -u admin:admin -X GET http://localhost:8080/packages
curl -u admin:admin -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.5-permissive.tar.gz" -X POST http://localhost:8080/install-package
curl -u admin:admin -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.6-permissive.tar.gz" -X POST http://localhost:8080/install-package
sleep 60
docker restart dsbaseclient-armadillo-1
sleep 30
Expand Down
2 changes: 1 addition & 1 deletion armadillo_azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ jobs:

curl -u admin:admin -X GET http://localhost:8080/packages

curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.5-permissive.tar.gz" -X POST http://localhost:8080/install-package
curl -u admin:admin --max-time 300 -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.6-permissive.tar.gz" -X POST http://localhost:8080/install-package
sleep 60

docker container restart dsbaseclient_armadillo_1
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:
- bash: |
R -q -e "library(opalr); opal <- opal.login(username = 'administrator', password = 'datashield_test&', url = 'http://localhost:8080'); opal.put(opal, 'system', 'conf', 'general', '_rPackage'); opal.logout(opal)"

R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='http://localhost:8080/'); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.5-dev'); opal.logout(opal)"
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='http://localhost:8080/'); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.6-dev'); opal.logout(opal)"

sleep 60

Expand Down
Binary file not shown.
Binary file renamed dsBase_6.3.5.tar.gz → dsBase_6.3.6.tar.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion opal_azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ jobs:
- bash: |
R -q -e "library(opalr); opal <- opal.login(username = 'administrator', password = 'datashield_test&', url = 'http://localhost:8080'); opal.put(opal, 'system', 'conf', 'general', '_rPackage'); opal.logout(opal)"

R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='http://localhost:8080/'); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.5-dev'); opal.logout(opal)"
R -q -e "library(opalr); opal <- opal.login('administrator','datashield_test&', url='http://localhost:8080/'); dsadmin.install_github_package(opal, 'dsBase', username = 'datashield', ref = 'v6.3.6-dev'); opal.logout(opal)"

sleep 60

Expand Down
11 changes: 8 additions & 3 deletions tests/docker/armadillo/standard/config/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,13 @@ stdout.log.path: '/logs/armadillo.log'

logging:
level:
root: INFO
root: "warn"
## change to DEBUG to have more details, typically when developing
org.molgenis: INFO
org.molgenis: "warn"
## Don't log upload data
org.apache.coyote.http11.Http11InputBuffer: INFO
org.apache.coyote.http11.Http11InputBuffer: "warn"
## SpringFramework
org.springframework.boot: "warn"
org.springframework.web: "warn"
org.springframework.core: "warn"
org.springframework.codex: "warn"
26 changes: 13 additions & 13 deletions tests/testthat/perf_files/armadillo_hp-laptop-quay_perf-profile.csv
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
"refer_name","rate","lower_tolerance","upper_tolerance"
"conndisconn::perf::simple0","0.04918","0.5","2"
"ds.abs::perf::0","1.184","0.5","2"
"ds.asInteger::perf:0","1.297","0.5","2"
"ds.asList::perf:0","2.884","0.5","2"
"ds.asNumeric::perf:0","1.354","0.5","2"
"ds.assign::perf::0","2.745","0.5","2"
"ds.class::perf::combine:0","3.261","0.5","2"
"ds.colnames::perf:0","8.566","0.5","2"
"ds.exists::perf::combine:0","6.342","0.5","2"
"ds.length::perf::combine:0","7.835","0.5","2"
"ds.mean::perf::combine:0","8.127","0.5","2"
"ds.mean::perf::split:0","8.109","0.5","2"
"void::perf::void::0","20280.0","0.5","2"
"conndisconn::perf::simple0","0.06790","0.5","2"
"ds.abs::perf::0","1.998","0.5","2"
"ds.asInteger::perf:0","2.111","0.5","2"
"ds.asList::perf:0","4.550","0.5","2"
"ds.asNumeric::perf:0","1.879","0.5","2"
"ds.assign::perf::0","4.806","0.5","2"
"ds.class::perf::combine:0","3.865","0.5","2"
"ds.colnames::perf:0","9.577","0.5","2"
"ds.exists::perf::combine:0","8.411","0.5","2"
"ds.length::perf::combine:0","7.957","0.5","2"
"ds.mean::perf::combine:0","9.049","0.5","2"
"ds.mean::perf::split:0","9.429","0.5","2"
"void::perf::void::0","21400.0","0.5","2"