kingfisher-collect(incremental): Set ignore_version for DR and create…

… scratchdir directory
open-contracting · May 1, 2024 · 5ad645e · 5ad645e
1 parent dc17eb2
commit 5ad645e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/pillar/kingfisher_main.sls b/pillar/kingfisher_main.sls
@@ -198,7 +198,7 @@ python_apps:
         spider: dominican_republic_api
         start_date: '2023-07-13'
         day: '1,15'
-        options: -a compile_releases=true
+        options: -a compile_releases=true -a ignore_version=true
         powerbi: True
         source_hash: 55f439386b8446067257a342d86254953c643fd569fee41a1b63a3b49d4aee6d
       - identifier: ECUADOR

diff --git a/salt/kingfisher/collect/incremental.sls b/salt/kingfisher/collect/incremental.sls
@@ -9,6 +9,7 @@ include:
 {% set directory = userdir + '/' + entry.git.target %}
 {% set sqldir = userdir + '/bi/sql' %}
 {% set settingsdir = userdir + '/bi/settings' %}
+{% set scratchdir = userdir + '/bi/scratch' %}
 
 {{ create_user(entry.user, authorized_keys=salt['pillar.get']('ssh:incremental', [])) }}
 
@@ -59,6 +60,13 @@ cardinal:
     - runas: {{ entry.user }}
     - unless: 'test "$(ocdscardinal --version)" = "ocdscardinal {{ pillar.cardinal.version }}"'
 
+{{ scratchdir }}:
+  file.directory:
+    - user: {{ entry.user }}
+    - group: {{ entry.user }}
+    - require:
+      - user: {{ entry.user }}_user_exists
+
 {{ userdir }}/bin/manage.py:
   file.managed:
     - source: https://raw.githubusercontent.com/open-contracting/cardinal-rs/main/manage.py
@@ -144,7 +152,7 @@ run {{ sqldir }}/excluded_supplier.sql:
         crawl: {{ crawl }}
         # Power BI
         settingsdir: {{ settingsdir }}
-        scratchdir: {{ userdir }}/bi/scratch
+        scratchdir: {{ scratchdir }}
     - makedirs: True
     - mode: 755
     - require: