Merge pull request datashield#523 from StuartWheater/v6.3.1-dev

Update documentation and testing framework

Author: StuartWheater

.Rbuildignore

@@ -7,6 +7,7 @@
 ^azure-pipelines_site-dsdanger\.pp$
 ^azure-pipelines_check\.Rout$
 ^azure-pipelines_test\.Rout$
+^tests/docker/armadillo/standard/log/.gitkeep$
 ^checkDocumentationUpdated\.sh$
 ^docker-compose_armadillo\.yml$
 ^docker-compose_opal\.yml$

DESCRIPTION

@@ -18,5 +18,7 @@ Imports:
     panelaggregation,
     methods,
     dplyr
-RoxygenNote: 7.2.3
+Suggests:
+    testthat
+RoxygenNote: 7.3.1
 Encoding: UTF-8

azure-pipelines.yml

@@ -552,17 +552,17 @@ jobs:
     # Install dsBase.
     # If previous steps have failed then don't run.
   - bash: |
-      curl -u admin:admin http://localhost:8080/whitelist
 
-      curl -u admin:admin -v -H 'Content-Type: multipart/form-data' -F "file=@dsBase_6.3.1-permissive.tar.gz" -X POST http://localhost:8080/install-package
+      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.1-permissive.tar.gz" -X POST http://localhost:8080/install-package
+      sleep 600
 
       docker container restart dsbaseclient_armadillo_1
-      sleep 120
+      sleep 30
 
       curl -u admin:admin -X POST http://localhost:8080/whitelist/dsBase
 
-      curl -u admin:admin http://localhost:8080/whitelist
-
     workingDirectory: $(Pipeline.Workspace)/dsBaseClient
     displayName: 'Install dsBase to Armadillo'
     condition: succeeded()

docker-compose_armadillo.yml

@@ -3,16 +3,21 @@ version: "3.4"
 services:
     armadillo:
         hostname: armadillo
-        image: datashield/armadillo_citest:1.1.0
-        environment:
-            DEBUG: "FALSE"
         ports:
             - 8080:8080
+        image: datashield/armadillo_citest:2.1.0
+        environment:
+            LOGGING_CONFIG: 'classpath:logback-file.xml'
+            AUDIT_LOG_PATH: '/app/logs/audit.log'
+            SPRING_SECURITY_USER_PASSWORD: 'admin'
+        volumes:
+            - ./tests/docker/armadillo/standard/logs:/logs
+            - ./tests/docker/armadillo/standard/data:/data
+            - ./tests/docker/armadillo/standard/config:/config
+            - /var/run/docker.sock:/var/run/docker.sock
 
-    citest_rserver:
-        hostname: citest_rserver
-        image: datashield/armadillo-rserver_ionic-babel:1.0.0
+    default:
+        hostname: default
+        image: datashield/rock-dolomite-devel-permissive:latest
         environment:
             DEBUG: "FALSE"
-        ports:
-            - 6311:6311

docker-compose_opal.yml

@@ -22,4 +22,4 @@ services:
             - MONGO_INITDB_ROOT_USERNAME=root
             - MONGO_INITDB_ROOT_PASSWORD=foobar
     rock:
-        image: datashield/rock-base:6.3-R4.3
+        image: datashield/rock-dolomite-devel-permissive:latest

docs/404.html

@@ -2,5 +2,5 @@ pandoc: 2.9.2.1
 pkgdown: 2.0.7
 pkgdown_sha: ~
 articles: {}
-last_built: 2023-05-16T20:52Z
+last_built: 2024-01-26T13:57Z