From 7cfc9c51e6bd08d5578534b674e0c368b3ad7a32 Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Wed, 15 Jan 2025 09:51:23 +0100
Subject: [PATCH] Use a colon as the version separator in update_system_workers
---
.../commands/update_system_workers.py | 2 +-
.../commands/test_update_system_workers.py | 22 +++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/arkindex/process/management/commands/update_system_workers.py b/arkindex/process/management/commands/update_system_workers.py
index 50d4fca06f..911350f923 100644
--- a/arkindex/process/management/commands/update_system_workers.py
+++ b/arkindex/process/management/commands/update_system_workers.py
@@ -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)
diff --git a/arkindex/process/tests/commands/test_update_system_workers.py b/arkindex/process/tests/commands/test_update_system_workers.py
index a626942629..351326b4cd 100644
--- a/arkindex/process/tests/commands/test_update_system_workers.py
+++ b/arkindex/process/tests/commands/test_update_system_workers.py
@@ -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)
--
GitLab