fixes

globaldothealth · May 18, 2022 · c70abf9 · c70abf9
1 parent 4a0e9c9
commit c70abf9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/data-serving/scripts/prune-uploads/hooks/aggregate.py b/data-serving/scripts/prune-uploads/hooks/aggregate.py
@@ -8,8 +8,8 @@
 
 AWS_REGION = os.getenv("GDH_AGGREGATE_AWS_REGION", "eu-central-1")
 # Job definition names are of the form PREFIX-<env>
-PREFIX = "gdh-map-aggregation"
-JOB_QUEUE = "gdh-map-aggregation"
+PREFIX = os.getenv("JOB_DEF_PREFIX", "gdh-map-aggregation")
+JOB_QUEUE = os.getenv("AGG_JOB_QUEUE", "gdh-map-aggregation-fargate")
 
 
 def run(sources: list[dict[str, Any]], env: str, dry_run: bool = False):

diff --git a/data-serving/scripts/prune-uploads/hooks/country_export.py b/data-serving/scripts/prune-uploads/hooks/country_export.py
@@ -3,13 +3,17 @@
 
 from functools import cache
 import logging
+import os
 from typing import Any
 import unicodedata
 
 import boto3
 import pycountry
 
 
+JOB_QUEUE = os.getenv("EXP_JOB_QUEUE", "export-queue")
+
+
 # We do not always use the pycountry names, here's a list of exceptions
 _QUIRKS = {
     "DEMOCRATIC REPUBLIC OF THE CONGO": "CD",
@@ -84,7 +88,7 @@ def run(sources: list[dict[str, Any]], env: str, dry_run: bool = False):
             logging.info(f"Submitting job for {jobdef} ...")
             if not dry_run:
                 batch.submit_job(
-                    jobName=jobdef, jobDefinition=jobdef, jobQueue="export-queue"
+                    jobName=jobdef, jobDefinition=jobdef, jobQueue=JOB_QUEUE
                 )
         except Exception as e:
             logging.exception(f"Error occurred while trying to submit {jobdef}")
diff --git a/verification/curator-service/ui/cypress/integration/components/BulkCaseForm.spec.ts b/verification/curator-service/ui/cypress/integration/components/BulkCaseForm.spec.ts
@@ -54,7 +54,6 @@ describe('Bulk upload form', function () {
 
         // Case data
         cy.contains('www.bulksource.com');
-        cy.contains('sourceEntryId');
         cy.contains('superuser@test.com');
         cy.contains('Data upload IDs')
             .parent()

diff --git a/verification/curator-service/ui/cypress/integration/components/Curator.spec.ts b/verification/curator-service/ui/cypress/integration/components/Curator.spec.ts
@@ -200,10 +200,6 @@ describe('Curator', function () {
                     'www.example.com',
                 );
             });
-            cy.get('input[name="caseReference.sourceEntryId"]').should(
-                'have.value',
-                'testSourceEntryID123',
-            );
 
             // Demographics.
             cy.get('input[name="gender"]').should('have.value', 'Female');