Merge pull request datashield#650 from StuartWheater/v6.3.6-dev

Rework image version and names

Author: StuartWheater

docker-compose_armadillo.yml

@@ -3,11 +3,12 @@ services:
         hostname: armadillo
         ports:
             - 8080:8080
-        image: datashield/armadillo_citest:5.12.2
+        image: datashield/armadillo_citest:latest
         environment:
             LOGGING_CONFIG: 'classpath:logback-file.xml'
             AUDIT_LOG_PATH: '/app/logs/audit.log'
             SPRING_SECURITY_USER_PASSWORD: 'admin'
+            DEBUG: "FALSE"
         volumes:
             - ./tests/docker/armadillo/standard/logs:/logs
             - ./tests/docker/armadillo/standard/data:/data
@@ -16,6 +17,6 @@ services:
 
     default:
         hostname: default
-        image: datashield/rock-quebrada-lamda-permissive:latest
+        image: datashield/rock_citest-permissive:latest
         environment:
             DEBUG: "FALSE"

docker-compose_opal.yml

@@ -15,11 +15,11 @@ services:
             - ROCK_HOSTS=rock:8085
             - ROCK_ADMINISTRATOR_PASSWORD=foobar
     mongo:
-        image: mongo:4.4.15
+        image: mongo:6.0.27
         environment:
             - MONGO_INITDB_ROOT_USERNAME=root
             - MONGO_INITDB_ROOT_PASSWORD=foobar
     rock:
-        image: datashield/rock-quebrada-lamda-permissive:latest
+        image: datashield/rock_citest-permissive:latest
         environment:
             DEBUG: "FALSE"

tests/docker/armadillo/standard/config/application.yml

@@ -14,11 +14,12 @@ armadillo:
   # oidc-admin-user: user@yourdomain.org
   profiles:
     - name: default
-      image: datashield/rock-quebrada-lamda-permissive:latest
+      image: datashield/rock_citest-permissive:latest
       port: 8085
       host: default
       package-whitelist: # Packages for 'permissive'
         - dsBase
+        - dsTidyverse
         - resourcer
       function-blacklist: [ ]
       options:

tests/testthat/perf_files/armadillo_hp-laptop-quay_perf-profile.csv

@@ -6,7 +6,7 @@
 "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","2.404","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"