From 3658547daa342095585411c1cd1816d2e2e8b531 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 13 Dec 2022 11:32:25 -0500 Subject: [PATCH 1/2] adding the config that enables the automated harvest tests to work (it makes it possible to test the paging behavior with fewer datasets than in normal operation). --- tasks/dataverse-api-testsuite.yml | 2 ++ tasks/dataverse-harvest-tests.yml | 11 +++++++++++ tests/group_vars/jenkins.yml | 7 +++++++ 3 files changed, 20 insertions(+) create mode 100644 tasks/dataverse-harvest-tests.yml diff --git a/tasks/dataverse-api-testsuite.yml b/tasks/dataverse-api-testsuite.yml index 1b25c6c4..d1a86ae6 100644 --- a/tasks/dataverse-api-testsuite.yml +++ b/tasks/dataverse-api-testsuite.yml @@ -117,3 +117,5 @@ - ansible_os_family == "RedHat" - db.postgres.log_statements != 'none' - not db.use_rds + +- include: dataverse-harvest-tests.yml diff --git a/tasks/dataverse-harvest-tests.yml b/tasks/dataverse-harvest-tests.yml new file mode 100644 index 00000000..0855bdfc --- /dev/null +++ b/tasks/dataverse-harvest-tests.yml @@ -0,0 +1,11 @@ +--- +# Our automated harvesting server tests rely on the paging limits to be set to something low (so that the behavior can be triggered and tested without having to create and export 100 datasets) + +- name: set page size limit for ListIdentifiers + shell: '{{ payara_dir}}/bin/asadmin create-jvm-options "-Ddataverse.oai.server.maxidentifiers={{ harvest.oaiserver.maxidentifiers }}"' + when: harvest.oaiserver.maxidentifiers is defined + +- name: set page size limit for ListRecords + shell: '{{ payara_dir}}/bin/asadmin create-jvm-options "-Ddataverse.oai.server.maxrecords={{ harvest.oaiserver.maxrecords }}"' + when: harvest.oaiserver.maxrecords is defined + diff --git a/tests/group_vars/jenkins.yml b/tests/group_vars/jenkins.yml index 9a0da257..5cbe92c5 100644 --- a/tests/group_vars/jenkins.yml +++ b/tests/group_vars/jenkins.yml @@ -302,6 +302,13 @@ sshkeys: urls: user: + +harvest: + oaiserver: + maxidentifiers: 2 + maxrecords: 2 + + # un-nesting the below so's we can pass them at the CLI dataverse_branch: develop From a69a26386e04b752a71b64644df866ef071b70ea Mon Sep 17 00:00:00 2001 From: Don Sizemore Date: Tue, 13 Dec 2022 13:49:32 -0500 Subject: [PATCH 2/2] #264 move harvesting server settings to optional-settings --- tasks/dataverse-api-testsuite.yml | 2 -- tasks/dataverse-harvest-tests.yml | 11 ----------- tasks/dataverse-optional-settings.yml | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 13 deletions(-) delete mode 100644 tasks/dataverse-harvest-tests.yml diff --git a/tasks/dataverse-api-testsuite.yml b/tasks/dataverse-api-testsuite.yml index d1a86ae6..1b25c6c4 100644 --- a/tasks/dataverse-api-testsuite.yml +++ b/tasks/dataverse-api-testsuite.yml @@ -117,5 +117,3 @@ - ansible_os_family == "RedHat" - db.postgres.log_statements != 'none' - not db.use_rds - -- include: dataverse-harvest-tests.yml diff --git a/tasks/dataverse-harvest-tests.yml b/tasks/dataverse-harvest-tests.yml deleted file mode 100644 index 0855bdfc..00000000 --- a/tasks/dataverse-harvest-tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Our automated harvesting server tests rely on the paging limits to be set to something low (so that the behavior can be triggered and tested without having to create and export 100 datasets) - -- name: set page size limit for ListIdentifiers - shell: '{{ payara_dir}}/bin/asadmin create-jvm-options "-Ddataverse.oai.server.maxidentifiers={{ harvest.oaiserver.maxidentifiers }}"' - when: harvest.oaiserver.maxidentifiers is defined - -- name: set page size limit for ListRecords - shell: '{{ payara_dir}}/bin/asadmin create-jvm-options "-Ddataverse.oai.server.maxrecords={{ harvest.oaiserver.maxrecords }}"' - when: harvest.oaiserver.maxrecords is defined - diff --git a/tasks/dataverse-optional-settings.yml b/tasks/dataverse-optional-settings.yml index c4d38155..d78ea914 100644 --- a/tasks/dataverse-optional-settings.yml +++ b/tasks/dataverse-optional-settings.yml @@ -19,3 +19,19 @@ - name: set TabularIngestSizeLimit when provided shell: 'curl -X PUT -d {{ dataverse.options.tabularingestsizelimit }} {{ dataverse.api.location }}/admin/settings/:TabularIngestSizeLimit' when: dataverse.options.tabularingestsizelimit + +# Our automated harvesting server tests rely on the paging limits to be set to something low +# (so that the behavior may be triggered and tested without having to create and export 100 datasets) + +- name: set page size limit for ListIdentifiers + become: yes + become_user: "{{ dataverse.payara.user }}" + shell: '{{ payara_dir}}/bin/asadmin create-jvm-options "-Ddataverse.oai.server.maxidentifiers={{ harvest.oaiserver.maxidentifiers }}"' + when: harvest.oaiserver.maxidentifiers is defined + +- name: set page size limit for ListRecords + become: yes + become_user: "{{ dataverse.payara.user }}" + shell: '{{ payara_dir}}/bin/asadmin create-jvm-options "-Ddataverse.oai.server.maxrecords={{ harvest.oaiserver.maxrecords }}"' + when: harvest.oaiserver.maxrecords is defined +