From 911f15b25cc272712ccff83b1557451a324dd1a9 Mon Sep 17 00:00:00 2001 From: Jay Quan Date: Thu, 23 Nov 2023 10:28:59 +0100 Subject: [PATCH] modified env variables based on new authorization for e2e test --- ...backend-next => .env.backend-next.example} | 22 +++++++++++++++---- CI/E2E/backend.env | 13 ++++++----- 2 files changed, 26 insertions(+), 9 deletions(-) rename CI/E2E/{.env.backend-next => .env.backend-next.example} (70%) diff --git a/CI/E2E/.env.backend-next b/CI/E2E/.env.backend-next.example similarity index 70% rename from CI/E2E/.env.backend-next rename to CI/E2E/.env.backend-next.example index 38d903468..3052c67a0 100644 --- a/CI/E2E/.env.backend-next +++ b/CI/E2E/.env.backend-next.example @@ -27,9 +27,23 @@ RABBITMQ_PASSWORD="rabbitmq" REGISTER_DOI_URI="https://mds.test.datacite.org/doi" REGISTER_METADATA_URI="https://mds.test.datacite.org/metadata" SITE="ESS" -ADMIN_GROUPS="admin, ingestor, archivemanager" -CREATE_DATASET_GROUPS="group1, group2, group3" -DELETE_GROUPS="archivemanager" -CREATE_DATASET_WITH_PID_GROUPS="" +OAI_PROVIDER_ROUTER= +ACCESS_GROUPS_STATIC_VALUES="ess,swap" +ADMIN_GROUPS="admin, ingestor" +CREATE_DATASET_GROUPS="group1,group2,group3" +CREATE_DATASET_WITH_PID_GROUPS="group2" +DELETE_GROUPS=" archivemanager" DATASET_CREATION_VALIDATION_ENABLED=true DATASET_CREATION_VALIDATION_REGEX="^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$" +PROPOSAL_GROUPS="proposalingestor" +SAMPLE_GROUPS="" + +ELASTICSEARCH_ENABLED='yes' +ES_HOST=http://es01:9200 +ES_USERNAME=elastic +ES_PASSWORD=duo-password +MONGODB_COLLECTION=Dataset +ES_MAX_RESULT=210000 +ES_FIELDS_LIMIT=400000 +ES_INDEX="dataset" +ES_REFRESH="wait_for" \ No newline at end of file diff --git a/CI/E2E/backend.env b/CI/E2E/backend.env index 9b004ddae..7c0dbf8b0 100644 --- a/CI/E2E/backend.env +++ b/CI/E2E/backend.env @@ -24,14 +24,17 @@ RABBITMQ_PASSWORD="rabbitmq" REGISTER_DOI_URI="https://mds.test.datacite.org/doi" REGISTER_METADATA_URI="https://mds.test.datacite.org/metadata" SITE="ESS" -ACCESS_GROUPS_STATIC_VALUES="ess,swap" -ADMIN_GROUPS="admin, ingestor, archivemanager" -CREATE_DATASET_GROUPS="group1, group2, group3" -DELETE_GROUPS="admin, archivemanager" OAI_PROVIDER_ROUTER= -CREATE_DATASET_WITH_PID_GROUPS="" +ACCESS_GROUPS_STATIC_VALUES="ess,swap" +ADMIN_GROUPS="admin, ingestor" +CREATE_DATASET_GROUPS="group1,group2,group3" +CREATE_DATASET_WITH_PID_GROUPS="group2" +DELETE_GROUPS=" archivemanager" DATASET_CREATION_VALIDATION_ENABLED=true DATASET_CREATION_VALIDATION_REGEX="^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$" +PROPOSAL_GROUPS="proposalingestor" +SAMPLE_GROUPS="" + ELASTICSEARCH_ENABLED='yes' ES_HOST=http://es01:9200 ES_USERNAME=elastic