Skip to content
Snippets Groups Projects
Commit 7cfc9c51 authored by Erwan Rouchet's avatar Erwan Rouchet Committed by Bastien Abadie
Browse files

Use a colon as the version separator in update_system_workers

parent defb7679
No related branches found
No related tags found
1 merge request!2507Use a colon as the version separator in update_system_workers
......@@ -245,7 +245,7 @@ class Command(BaseCommand):
worker_conf = next((worker for worker in data["workers"] if worker["slug"] == slug), None)
if worker_conf is None:
raise CommandError(f"No worker with slug {slug} in .arkindex.yml at {url}.")
image = f"registry.gitlab.teklia.com/{name}/{version}"
image = f"registry.gitlab.teklia.com/{name}:{version}"
command = worker_conf.get("docker", {}).get("command", None)
self.update_feature(feature, image=image, command=command, configuration=worker_conf, repo=repo)
......
......@@ -862,7 +862,7 @@ class TestUpdateSystemWorkers(ArkindexTestCase):
f"""
────────────────────────────────── FileImport ──────────────────────────────────
Configuring feature Fileimport from https://gitlab.teklia.com/repository/import/file
Using registry.gitlab.teklia.com/repository/import/file/0.1.0 to provide FileImport
Using registry.gitlab.teklia.com/repository/import/file:0.1.0 to provide FileImport
Created new System worker type ({worker_version.worker.type_id})
Created new FileImport system worker
Creating new worker version
......@@ -875,11 +875,11 @@ class TestUpdateSystemWorkers(ArkindexTestCase):
"slug": "file-import",
"type": "import_type",
})
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file/0.1.0")
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file:0.1.0")
self.assertEqual(worker_version.feature, ArkindexFeature.FileImport)
self.assertEqual(worker_version.state, WorkerVersionState.Available)
self.assertEqual(worker_version.version, 1)
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file/0.1.0")
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file:0.1.0")
self.assertEqual(worker_version.worker.name, "FileImport")
self.assertEqual(worker_version.worker.repository_url, "https://gitlab.teklia.com/repository/import/file")
......@@ -888,8 +888,8 @@ class TestUpdateSystemWorkers(ArkindexTestCase):
f"""
────────────────────────────────── FileImport ──────────────────────────────────
Configuring feature Fileimport from https://gitlab.teklia.com/repository/import/file
Using registry.gitlab.teklia.com/repository/import/file/0.1.0 to provide FileImport
Current worker version: {worker_version.id} (registry.gitlab.teklia.com/repository/import/file/0.1.0)
Using registry.gitlab.teklia.com/repository/import/file:0.1.0 to provide FileImport
Current worker version: {worker_version.id} (registry.gitlab.teklia.com/repository/import/file:0.1.0)
Worker is up to date
Worker version for FileImport is up to date
"""
......@@ -931,7 +931,7 @@ class TestUpdateSystemWorkers(ArkindexTestCase):
f"""
────────────────────────────────── FileImport ──────────────────────────────────
Configuring feature Fileimport from https://gitlab.teklia.com/repository/import/file
Using registry.gitlab.teklia.com/repository/import/file/0.1.0 to provide FileImport
Using registry.gitlab.teklia.com/repository/import/file:0.1.0 to provide FileImport
Current worker version: {version.id} (test)
This version has an invalid Docker image.
This version uses a custom configuration which could interfere with the feature.
......@@ -947,7 +947,7 @@ class TestUpdateSystemWorkers(ArkindexTestCase):
"slug": "file-import",
"type": "import_type",
})
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file/0.1.0")
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file:0.1.0")
self.assertEqual(worker_version.feature, ArkindexFeature.FileImport)
self.assertEqual(worker_version.state, WorkerVersionState.Available)
self.assertEqual(worker_version.version, 2)
......@@ -972,7 +972,7 @@ class TestUpdateSystemWorkers(ArkindexTestCase):
)
version = file_import_worker.versions.create(
version=1,
docker_image_iid="registry.gitlab.teklia.com/repository/import/file/0.1.0",
docker_image_iid="registry.gitlab.teklia.com/repository/import/file:0.1.0",
state=WorkerVersionState.Available,
feature=ArkindexFeature.FileImport,
configuration=worker_conf,
......@@ -990,13 +990,13 @@ class TestUpdateSystemWorkers(ArkindexTestCase):
f"""
────────────────────────────────── FileImport ──────────────────────────────────
Configuring feature Fileimport from https://gitlab.teklia.com/repository/import/file
Using registry.gitlab.teklia.com/repository/import/file/0.1.0 to provide FileImport
Current worker version: {version.id} (registry.gitlab.teklia.com/repository/import/file/0.1.0)
Using registry.gitlab.teklia.com/repository/import/file:0.1.0 to provide FileImport
Current worker version: {version.id} (registry.gitlab.teklia.com/repository/import/file:0.1.0)
Worker is up to date
Worker version for FileImport is up to date
"""
).strip())
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file/0.1.0")
self.assertEqual(worker_version.docker_image_iid, "registry.gitlab.teklia.com/repository/import/file:0.1.0")
self.assertEqual(worker_version.feature, ArkindexFeature.FileImport)
self.assertEqual(worker_version.state, WorkerVersionState.Available)
self.assertEqual(worker_version.version, 1)
......
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