fix for satellite

openclimatefix · Feb 14, 2025 · a9251eb · a9251eb
1 parent 71c26f2
commit a9251eb
Showing 1 changed file with 6 additions and 15 deletions.
diff --git a/terraform/modules/services/airflow/dags/uk/satellite-dag.py b/terraform/modules/services/airflow/dags/uk/satellite-dag.py
@@ -87,31 +87,22 @@
     )
 
     file_5min = f"s3://nowcasting-sat-{env}/data/latest/latest.zarr.zip"
-    command_5min = (
+    file_15min = f"s3://nowcasting-sat-{env}/data/latest/latest_15.zarr.zip"
+    command_5min_and_15min = (
+        f'curl -X GET '
+        f'"{url}/v0/solar/GB/update_last_data?component=satellite&file={file_5min}; "'
         f'curl -X GET '
-        f'"{url}/v0/solar/GB/update_last_data?component=satellite&file={file_5min}"'
+        f'"{url}/v0/solar/GB/update_last_data?component=satellite&file={file_15min}"'
     )
 
     satellite_update_5min = BashOperator(
         task_id=f"{region}-satellite-update-5min",
-        bash_command=command_5min,
+        bash_command=command_5min_and_15min,
     )
-
     file_15min = f"s3://nowcasting-sat-{env}/data/latest/latest_15.zarr.zip"
-    command_15min = (
-        f'curl -X GET '
-        f'"{url}/v0/solar/GB/update_last_data?component=satellite&file={file_15min}"'
-    )
 
-    satellite_update_15min = BashOperator(
-        task_id=f"{region}-satellite-update-15min",
-        bash_command=command_15min,
-        trigger_rule="all_failed",
-        on_failure_callback=slack_message_callback(satellite_both_files_missing_error_message),
-    )
 
     latest_only >> sat_consumer >> satellite_update_5min
-    satellite_update_5min >> satellite_update_15min
 
 with DAG(
     f"{region}-national-satellite-cleanup",