Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new reference dataset for integration tests #207

Merged
merged 2 commits into from
Jun 7, 2023
Merged

Use new reference dataset for integration tests #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8d01ed
use new test dataset
Jun 5, 2023
c700671
share volume betweein loader and nginx server
Jun 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions docker/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ ES_DISCOVERY_TYPE=single-node
# --------------------------------------------------------------------

# Docker image of the Registry API
REG_API_IMAGE=nasapds/registry-api-service:1.2.0
REG_API_IMAGE=nasapds/registry-api-service:latest

# Absolute path of the application.properties file to be used for the Registry API
REG_API_APP_PROPERTIES_FILE=./default-config/application.properties
Expand All @@ -32,7 +32,7 @@ REG_API_APP_PROPERTIES_FILE=./default-config/application.properties
# --------------------------------------------------------------------

# Docker image of the Registry Loader
REG_LOADER_IMAGE=nasapds/registry-loader:0.3.9
REG_LOADER_IMAGE=nasapds/registry-loader:latest

# --------------------------------------------------------------------
# Registry Sweepers
Expand Down Expand Up @@ -68,10 +68,10 @@ REG_API_URL=http://registry-api:8080
HARVEST_JOB_CONFIG_FILE=./default-config/harvest-job-config.xml

# URL to download the test data to Harvest (only required, if executing with test data)
TEST_DATA_URL=https://pds-gamma.jpl.nasa.gov/data/pds4/test-data/registry/urn-nasa-pds-insight_rad.tar.gz
TEST_DATA_URL=https://pds.nasa.gov/data/pds4/test-data/registry/custom-datasets.tar.gz

# The lidvid of the test data, which is used to set the archive status (only required, if executing with test data)
TEST_DATA_LIDVID=urn:nasa:pds:insight_rad::2.1
TEST_DATA_LIDVID=urn:nasa:pds:mars2020.spice::1.0 urn:nasa:pds:mars2020.spice::2.0 urn:nasa:pds:mars2020.spice::3.0

# --------------------------------------------------------------------
# Registry Harvest Service
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ services:
- TEST_DATA_URL=${TEST_DATA_URL}
- TEST_DATA_LIDVID=${TEST_DATA_LIDVID}
volumes:
- ${HARVEST_DATA_DIR}:${CONTAINER_HARVEST_DATA_DIR}
- ./scripts/registry-loader-waits-for-elasticsearch.sh:/usr/local/bin/registry-loader-waits-for-elasticsearch.sh
- ./default-config/es-auth.cfg:/etc/es-auth.cfg
networks:
Expand Down