Skip to content

Commit

Permalink
Reverse the default for Mediaflux connection to connect to the local …
Browse files Browse the repository at this point in the history
…mediaflux first (#894)
  • Loading branch information
carolyncole authored Aug 23, 2024
1 parent a97397a commit 67e3cdc
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ jobs:
# wait for postgres and mediaflux
- run: sleep 10
- run: bundle exec rake db:migrate RAILS_ENV=test
- run: bundle exec rake schema:create RAILS_ENV=test TEST_MEDIAFLUX_HOST='mflux-ci.lib.princeton.edu'
- run: MFLUX_CI=true bundle exec rake schema:create RAILS_ENV=test
- run:
name: Run Rspec
command: COVERALLS_REPO_TOKEN=$COVERALLS_REPO_TOKEN bundle exec rspec --format progress --format RspecJunitFormatter -o /tmp/rspec/rspec.xml
command: MFLUX_CI=true COVERALLS_REPO_TOKEN=$COVERALLS_REPO_TOKEN bundle exec rspec --format progress --format RspecJunitFormatter -o /tmp/rspec/rspec.xml
- store_test_results:
path: /tmp/rspec
- store_artifacts:
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@ The MediaFlux service documentation may be accessed using http://0.0.0.0.:8888/m

- Fast: `bundle exec rspec spec`
- Run in browser: `RUN_IN_BROWSER=true bundle exec rspec spec`
- Run connected to CI mediaflux instance: `MFLUX_CI=true bundle exec rspec spec`

### Starting the development server

Expand Down
4 changes: 2 additions & 2 deletions config/mediaflux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ test:
api_root_collection_namespace: '/td-test-001/test'
api_root_collection: 'path=/td-test-001/test/tigerdata'
api_transport: 'http'
api_host: <%= ENV["MFLUX_LOCAL"] ? "0.0.0.0" : 'mflux-ci.lib.princeton.edu' %>
api_port: <%= ENV["MFLUX_LOCAL"] ? "8888" : '80' %>
api_host: <%= ENV["MFLUX_CI"] ? "mflux-ci.lib.princeton.edu" : "0.0.0.0" %>
api_port: <%= ENV["MFLUX_CI"] ? "80" : "8888" %>

# Alternate to test is still a test location
api_alternate_root_ns: '/td-test-002/tigerdataNS'
Expand Down

0 comments on commit 67e3cdc

Please sign in to comment.