diff --git a/arkindex_worker/worker.py b/arkindex_worker/worker.py index c28c1e9065a62bdcc3756f02d3d499b5d3ea7f27..142fb9981f98de344d762080b1f8d175d5645470 100644 --- a/arkindex_worker/worker.py +++ b/arkindex_worker/worker.py @@ -84,9 +84,9 @@ class BaseWorker(object): "RetrieveWorkerVersion", id=self.worker_version_id ) logger.info( - f"Loaded worker {worker_version['worker']['name']} revision {worker_version['revision']} from API" + f"Loaded worker {worker_version['worker']['name']} revision {worker_version['revision']['hash'][0:7]} from API" ) - self.config = worker_version["configuration"] + self.config = worker_version["configuration"]["configuration"] elif self.args.config: # Load config from YAML file self.config = yaml.safe_load(self.args.config) diff --git a/tests/conftest.py b/tests/conftest.py index e4f8a4d1ddcac251c17f387aeda6b082dc4fb567..672f51c36a9061ebb1432762c103cb38a82670fd 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -51,8 +51,14 @@ def mock_worker_version_api(responses): """Provide a mock API response to get worker configuration""" payload = { "id": "12341234-1234-1234-1234-123412341234", - "configuration": {"someKey": "someValue"}, - "revision": "deadbeef", + "configuration": { + "docker": {"image": "python:3"}, + "configuration": {"someKey": "someValue"}, + }, + "revision": { + "hash": "deadbeef1234", + "name": "some git revision", + }, "docker_image": "python:3", "docker_image_name": "python:3", "state": "created", diff --git a/worker-{{cookiecutter.slug}}/.dockerignore b/worker-{{cookiecutter.slug}}/.dockerignore new file mode 100644 index 0000000000000000000000000000000000000000..8f0c2f7a8efe117056b5e92b78bc9f11384a7748 --- /dev/null +++ b/worker-{{cookiecutter.slug}}/.dockerignore @@ -0,0 +1,3 @@ +.tox +.git +models/*