EmrEtlRunner: updated Bash script to support enrichments path (fixes #…

…916) StorageLoader: updated combined Bash script to support enrichments path (fixes #917)
snowplow · Jul 23, 2014 · c9199eb · c9199eb
1 parent 3376e85
commit c9199eb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/3-enrich/emr-etl-runner/bin/snowplow-emr-etl-runner.sh b/3-enrich/emr-etl-runner/bin/snowplow-emr-etl-runner.sh
@@ -18,11 +18,12 @@
 rvm_path=/path/to/.rvm # Typically in the $HOME of the user who installed RVM
 RUNNER_PATH=/path/to/snowplow/3-enrich/snowplow-emr-etl-runner
 RUNNER_CONFIG=/path/to/your-config.yml
+RUNNER_ENRICHMENTS=/path/to/your/enrichment-jsons
 
 # Load the RVM environment
 export PATH=$PATH:${rvm_path}/bin
 source ${rvm_path}/scripts/rvm
 
 # Run the ETL job on EMR
 export BUNDLE_GEMFILE=${RUNNER_PATH}/Gemfile
-bundle exec ${RUNNER_PATH}/bin/snowplow-emr-etl-runner --config ${RUNNER_CONFIG}
+bundle exec ${RUNNER_PATH}/bin/snowplow-emr-etl-runner --config ${RUNNER_CONFIG} --enrichments ${RUNNER_ENRICHMENTS}
diff --git a/4-storage/storage-loader/bin/snowplow-runner-and-loader.sh b/4-storage/storage-loader/bin/snowplow-runner-and-loader.sh
@@ -16,6 +16,7 @@ rvm_path=/path/to/.rvm # Typically in the $HOME of the user who installed RVM
 RUNNER_PATH=/path/to/snowplow/3-enrich/emr-etl-runner
 LOADER_PATH=/path/to/snowplow/4-storage/storage-loader
 RUNNER_CONFIG=/path/to/your-runner-config.yml
+RUNNER_ENRICHMENTS=/path/to/your/enrichment-jsons
 LOADER_CONFIG=/path/to/your-loader-config.yml
 
 # Load the RVM environment
@@ -24,7 +25,7 @@ source ${rvm_path}/scripts/rvm
 
 # Run the ETL job on EMR
 export BUNDLE_GEMFILE=${RUNNER_PATH}/Gemfile
-bundle exec ${RUNNER_PATH}/bin/snowplow-emr-etl-runner --config ${RUNNER_CONFIG}
+bundle exec ${RUNNER_PATH}/bin/snowplow-emr-etl-runner --config ${RUNNER_CONFIG} --enrichments ${RUNNER_ENRICHMENTS}
 
 # Check the damage
 ret_val=$?

diff --git a/CHANGELOG b/CHANGELOG
@@ -7,8 +7,10 @@ EmrEtlRunner: removed enrichment-specific parameters from config.yml.sample (#80
 EmrEtlRunner: replaced enrichment-specific arguments from EmrEtlRunner (#808)
 EmrEtlRunner: removed %3D code following Scalding upgrade (#849)
 EmrEtlRunner: fixed contract on partition_by_run (#894)
+EmrEtlRunner: updated Bash script to support enrichments path (#916)
 StorageLoader: bumped to 0.3.1
 StorageLoader: now looking in eu-west-1 region for s3://snowplow-hosted-assets (#895)
+StorageLoader: updated combined Bash script to support enrichments path (#917)
 Scala Hadoop Enrich: bumped to 0.6.0
 Scala Hadoop Enrich: bumped Scala to 2.10.4 (#912)
 Scala Hadoop Enrich: bumped Scalding to 0.11.1 (#911)