Merge pull request #243 from sofyalaski/update-test-env

Update env variables for testing
paulscherrerinstitute · Oct 23, 2024 · 396db35 · 396db35
2 parents d2b107f + 2a3c53e
commit 396db35
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/dev/config/test_backend_next/.env b/dev/config/test_backend_next/.env
@@ -1,5 +1,7 @@
 MONGODB_URI=mongodb://mongodb:27017/test_be_next
 PID_PREFIX="API_testing"
+METADATA_KEYS_RETURN_LIMIT=100
+METADATA_PARENT_INSTANCES_RETURN_LIMIT=100
 ADMIN_GROUPS="admin,adminingestor"
 DELETE_GROUPS="archivemanager"
 CREATE_DATASET_GROUPS=group1,group2,group3
@@ -14,4 +16,6 @@ SAMPLE_GROUPS="group1"
 MONGODB_COLLECTION=Dataset
 STACK_VERSION=8.8.2
 MEM_LIMIT=4G
-JOB_CONFIGURATION_FILE="test/config/jobconfig.json" 
+JOB_CONFIGURATION_FILE="test/config/jobconfig.json"
+DATASET_CREATION_VALIDATION_ENABLED=true
+DATASET_CREATION_VALIDATION_REGEX="^API_testing/[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}$"
diff --git a/dev/config/test_backend_next/jobconfig.json b/dev/config/test_backend_next/jobconfig.json
@@ -16,6 +16,10 @@
           "headers": {
             "accept": "application/json"
           }
+        },
+        {
+          "actionType": "validate",
+          "required": ["jobParams.datasetIds[0]"]
         }
       ]
     },

diff --git a/dev/docker-compose.yaml b/dev/docker-compose.yaml
@@ -88,7 +88,7 @@ services:
       - ../scicat-backend-next:/home/node/app
       - /home/node/app/node_modules
       - /home/node/app/dist
-      - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json
+      - ../scicat-backend-next/functionalAccounts.json.minimal.example:/home/node/app/functionalAccounts.json
     env_file: ./config/backend_next/.env
     command: /bin/sh -c "while true; do sleep 600; done"
     profiles:
@@ -99,6 +99,7 @@ services:
     depends_on:
       - mongodb
     volumes:
+      - ../scicat-backend-next/functionalAccounts.json.test:/home/node/app/functionalAccounts.json
       - ./config/test_backend_next/jobconfig.json:/home/node/app/test/config/jobconfig.json
     env_file: ./config/test_backend_next/.env
     profiles: