Skip to content

Commit

Permalink
Remove randomisation config
Browse files Browse the repository at this point in the history
  • Loading branch information
evansd committed Jul 13, 2023
1 parent a095e1c commit c1a3420
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 12 deletions.
2 changes: 0 additions & 2 deletions jobrunner/cli/local_run.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,6 @@ def create_and_run_jobs(
):
# Fiddle with the configuration to suit what we need for running local jobs
docker.LABEL = docker_label
# It's more helpful in this context to have things consistent
config.RANDOMISE_JOB_ORDER = False
config.HIGH_PRIVACY_WORKSPACES_DIR = project_dir.parent
config.DATABASE_FILE = project_dir / "metadata" / "db.sqlite"
config.TMP_DIR = temp_dir
Expand Down
6 changes: 0 additions & 6 deletions jobrunner/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -127,12 +127,6 @@ def _is_valid_backend_name(name):
MAX_DB_WORKERS = int(os.environ.get("MAX_DB_WORKERS") or MAX_WORKERS)
MAX_RETRIES = int(os.environ.get("MAX_RETRIES", 0))

# This is a crude mechanism for preventing a single large JobRequest with lots
# of associated Jobs from hogging all the resources. We want this configurable
# because it's useful to be able to disable this during tests and when running
# locally
RANDOMISE_JOB_ORDER = True


STATA_LICENSE = os.environ.get("STATA_LICENSE")
STATA_LICENSE_REPO = os.environ.get(
Expand Down
4 changes: 0 additions & 4 deletions tests/test_integration.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ def test_integration_with_cohortextractor(
)
# Disable repo URL checking so we can run using a local test repo
monkeypatch.setattr("jobrunner.config.ALLOWED_GITHUB_ORGS", None)
# Make job execution order deterministic
monkeypatch.setattr("jobrunner.config.RANDOMISE_JOB_ORDER", False)

if extraction_tool == "cohortextractor":
image = "cohortextractor"
Expand Down Expand Up @@ -234,8 +232,6 @@ def test_integration_with_databuilder(
)
# Disable repo URL checking so we can run using a local test repo
monkeypatch.setattr("jobrunner.config.ALLOWED_GITHUB_ORGS", None)
# Make job execution order deterministic
monkeypatch.setattr("jobrunner.config.RANDOMISE_JOB_ORDER", False)

ensure_docker_images_present("databuilder:v0.36.0", "python")

Expand Down

0 comments on commit c1a3420

Please sign in to comment.