Review comments

cloudbuild.yaml

@@ -118,6 +118,7 @@ steps:
   id: 'Run E2E Test for FHIR-search mode with HAPI source'
   env:
   - PARQUET_SUBDIR=FHIR_SEARCH_HAPI
+  - FHIR_JSON_SUBDIR=FHIR_SEARCH_HAPI_JSON
   - DOCKER_NETWORK=--use_docker_network
   - SINK_SERVER=http://sink-server-search:8080
   waitFor: ['Run Batch Pipeline in FHIR-search mode with HAPI source', 'Build E2E Image']
@@ -140,6 +141,7 @@ steps:
   id: 'Run E2E Test for JDBC mode with HAPI source'
   env:
     - PARQUET_SUBDIR=JDBC_HAPI
+    - FHIR_JSON_SUBDIR=JDBC_HAPI_FHIR_JSON
     - DOCKER_NETWORK=--use_docker_network
     - SINK_SERVER=http://sink-server-jdbc:8080
   waitFor: ['Run Batch Pipeline for JDBC mode with HAPI source', 'Build E2E Image']
@@ -150,12 +152,15 @@ steps:
     - FHIR_FETCH_MODE=BULK_EXPORT
     - FHIR_SERVER_URL=http://hapi-server:8080/fhir
     - PARQUET_PATH=/workspace/e2e-tests/BULK_EXPORT
+  waitFor: ['Run E2E Test for JDBC mode with HAPI source']
 
 - name: '${_REPOSITORY}/e2e-tests:${_TAG}'
   id: 'Run E2E Test for BULK_EXPORT mode with HAPI source'
   env:
     - PARQUET_SUBDIR=BULK_EXPORT
+    - FHIR_JSON_SUBDIR=BULK_EXPORT_FHIR_JSON
     - DOCKER_NETWORK=--use_docker_network
+  waitFor: ['Run Batch Pipeline for BULK_EXPORT mode with HAPI source']
 
 # Resetting FHIR sink server
 - name: 'docker/compose'
@@ -237,7 +242,7 @@ steps:
   env:
     - SINK_SERVER_NAME=sink-server-for-openmrs
     - SINK_SERVER_PORT=9002
-  waitFor: ['Turn down FHIR Sink Server JDBC']
+  waitFor: ['Turn down FHIR Sink Server JDBC','Run E2E Test for BULK_EXPORT mode with HAPI source']
 
 - name: 'gcr.io/cloud-builders/docker'
   id: 'Wait for Servers Start'
@@ -258,6 +263,7 @@ steps:
   id: 'Run E2E Test for STREAMING, using OpenMRS Source'
   env:
     - PARQUET_SUBDIR=STREAMING
+    - FHIR_JSON_SUBDIR=STREAMING_FHIR_JSON
     - DOCKER_NETWORK=--use_docker_network
     - SINK_SERVER=http://sink-server-for-openmrs:8080
     - STREAMING_TEST=--streaming
@@ -286,6 +292,7 @@ steps:
   id: 'Run E2E Test for FHIR-search mode with OpenMRS source'
   env:
     - PARQUET_SUBDIR=FHIR_SEARCH_OPENMRS
+    - FHIR_JSON_SUBDIR=FHIR_SEARCH_OPENMRS_JSON
     - DOCKER_NETWORK=--use_docker_network
     - SINK_SERVER=http://sink-server-for-openmrs:8080
     - OPENMRS_TEST=--openmrs
@@ -306,6 +313,7 @@ steps:
   id: 'Run E2E Test for JDBC mode with OpenMRS source'
   env:
     - PARQUET_SUBDIR=JDBC_OPENMRS
+    - FHIR_JSON_SUBDIR=JDBC_OPENMRS_FHIR_JSON
     - DOCKER_NETWORK=--use_docker_network
     - SINK_SERVER=http://sink-server-for-openmrs:8080
     - OPENMRS_TEST=--openmrs