Merge pull request #1340 from cmu-delphi/add_delivery

krivard · web-flow · commit 665220efb536 · 2021-10-27T15:21:35.000-04:00
Add delivery to runner params
diff --git a/ansible/templates/covid_act_now-params-prod.json.j2 b/ansible/templates/covid_act_now-params-prod.json.j2
@@ -1,6 +1,6 @@
 {
   "common": {
-    "export_dir": "/common/covidcast/receiving/covid-act-now",
+    "export_dir": "./receiving",
     "log_filename": "/var/log/indicators/covid_act_now.log"
   },
   "indicator": {
@@ -44,5 +44,8 @@
       "smoothed_signals": [
       ]
     }
-  }  
+  },
+  "delivery": {
+    "delivery_dir": "/common/covidcast/receiving/covid-act-now"
+  }
 }
diff --git a/ansible/templates/quidel_covidtest-params-prod.json.j2 b/ansible/templates/quidel_covidtest-params-prod.json.j2
@@ -1,6 +1,6 @@
 {
   "common": {
-    "export_dir": "/common/covidcast/receiving/quidel",
+    "export_dir": "./receiving",
     "log_filename": "/var/log/indicators/quidel_covidtest.log"
   },
   "indicator": {
@@ -47,5 +47,8 @@
         "covid_ag_smoothed_pct_positive"
       ]
     }
+  },
+  "delivery": {
+    "delivery_dir": "/common/covidcast/receiving/quidel"
   }
 }
diff --git a/ansible/templates/usafacts-params-prod.json.j2 b/ansible/templates/usafacts-params-prod.json.j2
@@ -1,6 +1,6 @@
 {
   "common": {
-    "export_dir": "/common/covidcast/receiving/usa-facts",
+    "export_dir": "./receiving",
     "input_dir": "./input-cache",
     "log_filename": "/var/log/indicators/usafacts.log"
   },
@@ -48,5 +48,8 @@
         "deaths_7dav_incidence_num",
         "deaths_7dav_incidence_prop"]
     }
+  },
+  "delivery": {
+    "delivery_dir": "/common/covidcast/receiving/usa-facts"
   }
 }
diff --git a/covid_act_now/params.json.template b/covid_act_now/params.json.template
@@ -44,5 +44,8 @@
       "smoothed_signals": [
       ]
     }
+  },
+  "delivery": {
+    "delivery_dir": "./receiving"
   }
 }
diff --git a/quidel_covidtest/params.json.template b/quidel_covidtest/params.json.template
@@ -48,5 +48,8 @@
         "covid_ag_smoothed_pct_positive"
       ]
     }
+  },
+  "delivery": {
+    "delivery_dir": "./receiving"
   }
 }
diff --git a/usafacts/params.json.template b/usafacts/params.json.template
@@ -49,5 +49,8 @@
         "deaths_7dav_incidence_num",
         "deaths_7dav_incidence_prop"]
     }
+  },
+  "delivery": {
+    "delivery_dir": "./receiving"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"common": {`
`3`		`- "export_dir": "/common/covidcast/receiving/covid-act-now",`
	`3`	`+ "export_dir": "./receiving",`
`4`	`4`	`"log_filename": "/var/log/indicators/covid_act_now.log"`
`5`	`5`	`},`
`6`	`6`	`"indicator": {`
`@@ -44,5 +44,8 @@`
`44`	`44`	`"smoothed_signals": [`
`45`	`45`	`]`
`46`	`46`	`}`
`47`		`- }`
	`47`	`+ },`
	`48`	`+ "delivery": {`
	`49`	`+ "delivery_dir": "/common/covidcast/receiving/covid-act-now"`
	`50`	`+ }`
`48`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,5 +48,8 @@`
`48`	`48`	`"covid_ag_smoothed_pct_positive"`
`49`	`49`	`]`
`50`	`50`	`}`
	`51`	`+ },`
	`52`	`+ "delivery": {`
	`53`	`+ "delivery_dir": "./receiving"`
`51`	`54`	`}`
`52`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,5 +49,8 @@`
`49`	`49`	`"deaths_7dav_incidence_num",`
`50`	`50`	`"deaths_7dav_incidence_prop"]`
`51`	`51`	`}`
	`52`	`+ },`
	`53`	`+ "delivery": {`
	`54`	`+ "delivery_dir": "./receiving"`
`52`	`55`	`}`
`53`	`56`	`}`