Skip to content

Commit

Permalink
tests: Move test_ckan env vars into separate file
Browse files Browse the repository at this point in the history
  • Loading branch information
bellisk committed Nov 20, 2023

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 3e25411 commit ef63637
Showing 2 changed files with 11 additions and 7 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -40,11 +40,6 @@ jobs:
redis:
image: redis:3
env:
CKAN_SQLALCHEMY_URL: postgresql://ckan_default:pass@postgres/ckan_test
CKAN_DATASTORE_WRITE_URL: postgresql://datastore_write:pass@postgres/datastore_test
CKAN_DATASTORE_READ_URL: postgresql://datastore_read:pass@postgres/datastore_test
CKAN_SOLR_URL: http://solr:8983/solr/ckan
CKAN_REDIS_URL: redis://redis:6379/1
WORKDIR: /__w/ckanext-switzerland/ckanext-switzerland
SOLR_CONFIG_CKAN_DIR: /opt/solr/server/solr/configsets/ckan/conf

@@ -66,8 +61,8 @@ jobs:
- name: Create ckan container
run: |
/usr/bin/docker create --name test_ckan --network ${{ job.container.network }} --network-alias ckan \
-e "HOME=/github/home" -e GITHUB_ACTIONS=true -e CI=true -e CKAN_SITE_URL=http://odp.test \
-e CKAN_SOLR_URL=http://solr:8983/solr/ckan -v "/var/run/docker.sock":"/var/run/docker.sock" \
--env-file $WORKDIR/github-workflow.env \
-v "/var/run/docker.sock":"/var/run/docker.sock" \
-v "/home/runner/work":"/__w" -v "/home/runner/work/_temp":"/__w/_temp" \
-v "/home/runner/work/_actions":"/__w/_actions" -v "/opt/hostedtoolcache":"/__t" \
-v "/home/runner/work/_temp/_github_home":"/github/home" \
9 changes: 9 additions & 0 deletions github-workflow.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HOME=/github/home
GITHUB_ACTIONS=true
CI=true
CKAN_SQLALCHEMY_URL=postgresql://ckan_default:pass@postgres/ckan_test
CKAN_DATASTORE_WRITE_URL=postgresql://datastore_write:pass@postgres/datastore_test
CKAN_DATASTORE_READ_URL=postgresql://datastore_read:pass@postgres/datastore_test
CKAN_SOLR_URL=http://solr:8983/solr/ckan
CKAN_REDIS_URL=redis://redis:6379/1
CKAN_SITE_URL=http://odp.test

0 comments on commit ef63637

Please sign in to comment.