From ea23e90e225bc721fc9240642855f4f59c4bc3d7 Mon Sep 17 00:00:00 2001
From: Yoann Schneider <yschneider@teklia.com>
Date: Fri, 22 Jul 2022 12:06:51 +0200
Subject: [PATCH] use ARKINDEX_WORKER_RUN_ID
---
arkindex_worker/worker/base.py | 4 ++--
tests/conftest.py | 2 +-
tests/test_base_worker.py | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arkindex_worker/worker/base.py b/arkindex_worker/worker/base.py
index 9423d68a..cc78ce07 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 e2e75c9d..ea16385f 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 f3cba844..0a6cf496 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()
--
GitLab