addres comments

mozzy11 · Jan 13, 2025 · 7cea4ae · 7cea4ae
1 parent 8750385
commit 7cea4ae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 17 deletions.
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
@@ -194,11 +194,6 @@ steps:
   env:
     - PIPELINE_CONFIG=/workspace/docker/config
     - DWH_ROOT=/workspace/e2e-tests/controller-spark/dwh
-    - FHIRDATA_SINKFHIRSERVERURL=
-    - FHIRDATA_GENERATEPARQUETFILES=true
-    - FHIRDATA_CREATEHIVERESOURCETABLES=true
-    - FHIRDATA_CREATEPARQUETVIEWS=true
-    - FHIRDATA_SINKDBCONFIGPATH=config/hapi-postgres-config_local_views.json
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'up',
           '--force-recreate', '-d' ]
   waitFor: ['Create views database']
@@ -228,11 +223,11 @@ steps:
   env:
     - SINK_SERVER_NAME=sink-server-controller
     - SINK_SERVER_PORT=9001
-  waitFor: ['Bring down controller and Spark containers for FHIR server to FHIR server sync']
+  waitFor: ['Bring down controller and Spark containers']
 
 # Spinning up only the pipeline controller for FHIR server to FHIR server sync
 - name: 'docker/compose'
-  id: 'Bring up the pipeline controller'
+  id: 'Bring up the pipeline controller for for FHIR server to FHIR server sync'
   env:
     - PIPELINE_CONFIG=/workspace/docker/config
     - DWH_ROOT=/workspace/e2e-tests/controller-spark/dwh
@@ -243,27 +238,27 @@ steps:
     - FHIRDATA_SINKDBCONFIGPATH=
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'up',
           '--force-recreate', '--no-deps' , '-d' ,'pipeline-controller' ]
-  waitFor: ['Launch HAPI FHIR Sink Server Controller']         
+  waitFor: ['Launch HAPI FHIR Sink Server']         
 
 - name: '${_REPOSITORY}/e2e-tests/controller-spark:${_TAG}'
   id: 'Run E2E Test for Dockerized Controller in FHIR server to FHIR server sync mode'   
-  waitFor: ['Bring up the pipeline controller']
+  waitFor: ['Bring up the pipeline controller for for FHIR server to FHIR server sync']
   env:
     - DWH_TYPE="FHIR"  
 
 - name: 'docker/compose'
-  id: 'Bring down controller'
+  id: 'Bring down the pipeline controller'
   args: [ '-f', './docker/compose-controller-spark-sql-single.yaml', 'down' ,'-v']    
-  waitFor: ['Run E2E Test for Dockerized Controller for FHIR server to FHIR server sync']
+  waitFor: ['Run E2E Test for Dockerized Controller in FHIR server to FHIR server sync mode']
 
 - name: 'docker/compose'
   id: 'Turn down HAPI Source Server'
   args: [ '-f', './docker/hapi-compose.yml', 'down' ]
-  waitFor: ['Bring down controller']
+  waitFor: ['Bring down the pipeline controller']
 
 - name: 'docker/compose'
   id: 'Turn down FHIR Sink Server Controller for e2e tests'
-  args: [ '-f', './docker/sink-compose.yml', '-p', 'sink-server-controller', 'down' ,'-v']
+  args: [ '-f', './docker/sink-compose.yml', '-p', 'sink-server', 'down' ,'-v']
   env:
     - SINK_SERVER_NAME=sink-server-controller
     - SINK_SERVER_PORT=9001

diff --git a/docker/compose-controller-spark-sql-single.yaml b/docker/compose-controller-spark-sql-single.yaml
@@ -63,11 +63,11 @@ services:
     environment:
       - JAVA_OPTS=$JAVA_OPTS
       # This is to override the values in the default config.
-      - FHIRDATA_SINKFHIRSERVERURL=$FHIRDATA_SINKFHIRSERVERURL
+      - FHIRDATA_SINKFHIRSERVERURL=$(FHIRDATA_SINKFHIRSERVERURL:-}
       - FHIRDATA_GENERATEPARQUETFILES=${FHIRDATA_GENERATEPARQUETFILES:-true}
-      - FHIRDATA_CREATEHIVERESOURCETABLES=$FHIRDATA_CREATEHIVERESOURCETABLES
-      - FHIRDATA_CREATEPARQUETVIEWS=$FHIRDATA_CREATEPARQUETVIEWS
-      - FHIRDATA_SINKDBCONFIGPATH=$FHIRDATA_SINKDBCONFIGPATH
+      - FHIRDATA_CREATEHIVERESOURCETABLES=${FHIRDATA_CREATEHIVERESOURCETABLES:-true}
+      - FHIRDATA_CREATEPARQUETVIEWS=${FHIRDATA_CREATEPARQUETVIEWS:-true}
+      - FHIRDATA_SINKDBCONFIGPATH=${FHIRDATA_SINKDBCONFIGPATH:-config/hapi-postgres-config_local_views.json}
     ports:
       - '8090:8080'
     networks: