@@ -276,14 +276,26 @@ jobs:
276276
277277
278278 #####################################################################################
279- # Install dsDanger.
279+ # Install dsDanger on server
280280 # If previous steps have failed then don't run
281281 - bash : |
282282
283283 sudo /opt/puppetlabs/bin/puppet apply $(Pipeline.Workspace)/dsBaseClient/azure-pipelines_site-dsdanger.pp --environment datashield_azurepipelines --environmentpath puppet/environments
284284
285285 workingDirectory: $(Pipeline.Workspace)/datashield-infrastructure
286- displayName: 'Install DataSHIELD package (dsDanger)'
286+ displayName: 'Install dsDanger DataSHIELD package on server'
287+ condition: succeeded()
288+
289+
290+ #####################################################################################
291+ # Install dsDangerClient.
292+ # If previous steps have failed then don't run
293+ - bash : |
294+
295+ sudo R -q -e "library('devtools'); devtools::install_github(repo='datashield/dsDangerClient', ref='v6.1-dev', dependencies = TRUE)"
296+
297+ workingDirectory: $(Pipeline.Workspace)/dsBaseClient
298+ displayName: 'Install dsDangerClient DataSHIELD package'
287299 condition: succeeded()
288300
289301
@@ -320,7 +332,7 @@ jobs:
320332 junit_rep <- JunitReporter$new(file = "test_results.xml");
321333 progress_rep <- ProgressReporter$new(max_failures = 999999);
322334 multi_rep <- MultiReporter$new(reporters = list(progress_rep, junit_rep));
323- testthat::test_package("$(projectName)", filter = "_-",reporter = multi_rep, stop_on_failure = FALSE)'"'"')
335+ testthat::test_package("$(projectName)", filter = "_-|smk_dgr- ",reporter = multi_rep, stop_on_failure = FALSE)'"'"')
324336 )
325337 ),
326338 "coveragelist.csv"
0 commit comments