Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Backend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Arkindex
Backend
Commits
7cfc9c51
Commit
7cfc9c51
authored
2 months ago
by
Erwan Rouchet
Committed by
Bastien Abadie
2 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Use a colon as the version separator in update_system_workers
parent
defb7679
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!2507
Use a colon as the version separator in update_system_workers
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
arkindex/process/management/commands/update_system_workers.py
+1
-1
1 addition, 1 deletion
...ndex/process/management/commands/update_system_workers.py
arkindex/process/tests/commands/test_update_system_workers.py
+11
-11
11 additions, 11 deletions
...ndex/process/tests/commands/test_update_system_workers.py
with
12 additions
and
12 deletions
arkindex/process/management/commands/update_system_workers.py
+
1
−
1
View file @
7cfc9c51
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
arkindex/process/tests/commands/test_update_system_workers.py
+
11
−
11
View file @
7cfc9c51
...
...
@@ -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
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment