Skip to content

Commit

Permalink
Merge pull request #908 from SciCatProject/fixed_env_vars_for_new_aut…
Browse files Browse the repository at this point in the history
…horization

modified env variables based on new authorization for e2e test
  • Loading branch information
nitrosx authored Nov 23, 2023
2 parents bee58dd + 911f15b commit d19d471
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 9 deletions.
22 changes: 18 additions & 4 deletions CI/E2E/.env.backend-next → CI/E2E/.env.backend-next.example
Original file line number Diff line number Diff line change
Expand Up @@ -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"
13 changes: 8 additions & 5 deletions CI/E2E/backend.env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d19d471

Please sign in to comment.