Create much more complete travis test

.travis.yml

@@ -9,13 +9,21 @@ before_install:
   - make fast
 script:
   # Test import
-  - docker-compose up -d postgis
+  - docker-compose up -d postgis rabbitmq mock-s3
   - sleep 10
   - docker-compose run import-external
   - docker-compose run import-osm
   - docker-compose run import-sql
   # Test local export
-  - docker-compose run export
+  - docker-compose run export && mv export/tiles.mbtiles export/planet.mbtiles
+  # Test distributed export
+  - docker-compose run -e TILE_X=539 -e TILE_Y=359 -e TILE_Z=10 -e JOB_ZOOM=11 generate-jobs
+  - docker-compose scale export-worker=2
+  - sleep 60
+  - docker-compose scale export-worker=0
+  - docker-compose run -d merge-jobs
+  - sleep 10
+  - docker-compose stop merge-jobs
   # Test changed tiles
   - docker-compose run update-osm-diff
   - docker-compose run import-osm-diff
@@ -25,3 +33,5 @@ script:
   - sleep 30
   - docker-compose scale export-worker=0
   - docker-compose run merge-jobs
+  - sleep 10
+  - docker-compose stop merge-jobs

src/generate-jobs/generate_world_jobs.sh

@@ -3,15 +3,19 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-readonly AMQP_URI=${AMQP_URI:-"ampq://osm:osm@rabbitmq:5672/"}
+readonly AMQP_URI=${AMQP_URI:-"amqp://osm:osm@rabbitmq:5672/"}
 readonly EXPORT_DATA_DIR=${EXPORT_DATA_DIR:-"/data/export"}
+readonly TILE_X=${TILE_X:-"0"}
+readonly TILE_Y=${TILE_Y:-"0"}
+readonly TILE_Z=${TILE_Z:-"0"}
+readonly JOB_ZOOM=${JOB_ZOOM:-"8"}
 
 function generate_world_jobs() {
     local jobs_file="$EXPORT_DATA_DIR/world_jobs.txt"
     local jobs_queue="jobs"
 
-    python generate_jobs.py pyramid 0 0 0 --job-zoom=8 > $jobs_file
-    AMQP_URI="$AMQP_URI" pipecat publish "$jobs_queue" < $jobs_file
+    python generate_jobs.py pyramid "$TILE_X" "$TILE_Y" "$TILE_Z" --job-zoom="$JOB_ZOOM" > $jobs_file
+    pipecat publish --amqpuri="$AMQP_URI" "$jobs_queue" < $jobs_file
 }
 
 generate_world_jobs