diff --git a/arkindex_worker/worker/base.py b/arkindex_worker/worker/base.py index 9423d68a1d18ee5c62cc01b5d2b98955c11dd0e8..cc78ce07c10e10d9cca460f1b05895274b67a28e 100644 --- a/arkindex_worker/worker/base.py +++ b/arkindex_worker/worker/base.py @@ -110,10 +110,10 @@ class BaseWorker(object): logger.warning( "Missing WORKER_VERSION_ID environment variable, worker is in read-only mode" ) - self.worker_run_id = os.environ.get("WORKER_RUN_ID") + self.worker_run_id = os.environ.get("ARKINDEX_WORKER_RUN_ID") if not self.worker_run_id: logger.warning( - "Missing WORKER_RUN_ID environment variable, worker is in read-only mode" + "Missing ARKINDEX_WORKER_RUN_ID environment variable, worker is in read-only mode" ) logger.info(f"Worker will use {self.work_dir} as working directory") diff --git a/tests/conftest.py b/tests/conftest.py index e2e75c9d6f0906eb3769a7f8702380fd7e927e3a..ea16385f33c0e1a0d5dec64c59d273208d58bd07 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -104,7 +104,7 @@ def setup_api(responses, monkeypatch, cache_yaml): def give_env_variable(request, monkeypatch): """Defines required environment variables""" monkeypatch.setenv("WORKER_VERSION_ID", "12341234-1234-1234-1234-123412341234") - monkeypatch.setenv("WORKER_RUN_ID", "56785678-5678-5678-5678-567856785678") + monkeypatch.setenv("ARKINDEX_WORKER_RUN_ID", "56785678-5678-5678-5678-567856785678") monkeypatch.setenv("ARKINDEX_CORPUS_ID", "11111111-1111-1111-1111-111111111111") diff --git a/tests/test_base_worker.py b/tests/test_base_worker.py index f3cba84470c078a0e68f023a14944ef13d5b0caa..0a6cf496b9774f429e3dfc27a4d05f19af79a973 100644 --- a/tests/test_base_worker.py +++ b/tests/test_base_worker.py @@ -49,7 +49,7 @@ def test_init_var_ponos_data_given(monkeypatch): def test_init_var_worker_version_id_missing(monkeypatch): monkeypatch.setattr(sys, "argv", ["worker"]) monkeypatch.delenv("WORKER_VERSION_ID") - monkeypatch.delenv("WORKER_RUN_ID") + monkeypatch.delenv("ARKINDEX_WORKER_RUN_ID") worker = BaseWorker() worker.args = worker.parser.parse_args() worker.configure_for_developers() @@ -60,7 +60,7 @@ def test_init_var_worker_version_id_missing(monkeypatch): def test_init_var_worker_run_id_missing(monkeypatch): monkeypatch.setattr(sys, "argv", ["worker"]) - monkeypatch.delenv("WORKER_RUN_ID") + monkeypatch.delenv("ARKINDEX_WORKER_RUN_ID") worker = BaseWorker() worker.args = worker.parser.parse_args() worker.configure_for_developers() @@ -76,7 +76,7 @@ def test_init_var_worker_local_file(monkeypatch, tmp_path): monkeypatch.setattr(sys, "argv", ["worker", "-c", str(config)]) monkeypatch.delenv("WORKER_VERSION_ID") - monkeypatch.delenv("WORKER_RUN_ID") + monkeypatch.delenv("ARKINDEX_WORKER_RUN_ID") worker = BaseWorker() worker.args = worker.parser.parse_args() worker.configure_for_developers()