Skip to content
Snippets Groups Projects
Commit 35fbb44f authored by Bastien Abadie's avatar Bastien Abadie
Browse files

Update api config prefixes

parent 3284cb52
No related branches found
No related tags found
1 merge request!22Update api config prefixes
Pipeline #77956 passed
...@@ -84,9 +84,9 @@ class BaseWorker(object): ...@@ -84,9 +84,9 @@ class BaseWorker(object):
"RetrieveWorkerVersion", id=self.worker_version_id "RetrieveWorkerVersion", id=self.worker_version_id
) )
logger.info( 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: elif self.args.config:
# Load config from YAML file # Load config from YAML file
self.config = yaml.safe_load(self.args.config) self.config = yaml.safe_load(self.args.config)
......
...@@ -51,8 +51,14 @@ def mock_worker_version_api(responses): ...@@ -51,8 +51,14 @@ def mock_worker_version_api(responses):
"""Provide a mock API response to get worker configuration""" """Provide a mock API response to get worker configuration"""
payload = { payload = {
"id": "12341234-1234-1234-1234-123412341234", "id": "12341234-1234-1234-1234-123412341234",
"configuration": {"someKey": "someValue"}, "configuration": {
"revision": "deadbeef", "docker": {"image": "python:3"},
"configuration": {"someKey": "someValue"},
},
"revision": {
"hash": "deadbeef1234",
"name": "some git revision",
},
"docker_image": "python:3", "docker_image": "python:3",
"docker_image_name": "python:3", "docker_image_name": "python:3",
"state": "created", "state": "created",
......
.tox
.git
models/*
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment