Skip to content

Commit

Permalink
fix: migrate uuids
Browse files Browse the repository at this point in the history
  • Loading branch information
grutt committed Sep 18, 2024
1 parent 256fe2e commit 32ab35a
Show file tree
Hide file tree
Showing 13 changed files with 795 additions and 787 deletions.
66 changes: 33 additions & 33 deletions pkg/scheduling/fixtures/affinity_hard.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"actionId": "child:process2"
},
{
"id": "aed946be-43db-4b5f-876a-c6c71f4d52aa",
"id": "aed946be-43db-4b5f-876a-c6c71f4d52aa",
"workerId": "bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa",
"dispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21",
"actionId": "child:process2"
},
{
"id": "e2c744b8-43db-4b5f-876a-c6c71f4d52aa",
"id": "e2c744b8-43db-4b5f-876a-c6c71f4d52aa",
"workerId": "bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa",
"dispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21",
"actionId": "child:process2"
Expand All @@ -31,7 +31,7 @@
"QueueItems": [
{
"id": 137295,
"stepRunId": "16fa711e-c03e-435c-88d9-62adf1591d98",
"stepRunId": 24,
"stepId": "29fae13a-6672-48cb-9aed-3b0bf481f570",
"actionId": "child:process2",
"scheduleTimeoutAt": "2024-08-07T19:43:30.692Z",
Expand All @@ -43,7 +43,7 @@
},
{
"id": 152259,
"stepRunId": "064e787a-6cfd-4f82-8b6d-d8031459fdee",
"stepRunId": 6,
"stepId": "e2c744b8-bebb-4b05-8292-d2ce36f27928",
"actionId": "child:process2",
"scheduleTimeoutAt": "2024-08-07T21:12:49.56Z",
Expand All @@ -55,7 +55,7 @@
},
{
"id": 152260,
"stepRunId": "064e787a-6cfd-4f82-8b6d-d8031459fdef",
"stepRunId": 7,
"stepId": "e2c744b8-bebb-4b05-8292-d2ce36f27929",
"actionId": "child:process2",
"scheduleTimeoutAt": "2024-08-07T21:12:49.56Z",
Expand All @@ -81,32 +81,32 @@
]
},
"StepDesiredLabels": {
"29fae13a-6672-48cb-9aed-3b0bf481f570": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "A",
"Required": true,
"Weight": 1
}
],
"e2c744b8-bebb-4b05-8292-d2ce36f27928": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "B",
"Required": true,
"Weight": 1
}
],
"e2c744b8-bebb-4b05-8292-d2ce36f27929": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "C",
"Required": true,
"Weight": 1
}
]
}
"29fae13a-6672-48cb-9aed-3b0bf481f570": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "A",
"Required": true,
"Weight": 1
}
],
"e2c744b8-bebb-4b05-8292-d2ce36f27928": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "B",
"Required": true,
"Weight": 1
}
],
"e2c744b8-bebb-4b05-8292-d2ce36f27929": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "C",
"Required": true,
"Weight": 1
}
]
}
}
10 changes: 5 additions & 5 deletions pkg/scheduling/fixtures/affinity_hard_output.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"StepRunIds": [
"16fa711e-c03e-435c-88d9-62adf1591d98",
"064e787a-6cfd-4f82-8b6d-d8031459fdee"
24,
6
],
"StepRunTimeouts": [
"60s",
Expand All @@ -16,16 +16,16 @@
"bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa"
],
"UnassignedStepRunIds": [
"064e787a-6cfd-4f82-8b6d-d8031459fdef"
7
],
"QueuedStepRuns": [
{
"StepRunId": "16fa711e-c03e-435c-88d9-62adf1591d98",
"StepRunId": 24,
"WorkerId": "aaaaaaaa-43db-4b5f-876a-c6c71f4d52aa",
"DispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21"
},
{
"StepRunId": "064e787a-6cfd-4f82-8b6d-d8031459fdee",
"StepRunId": 6,
"WorkerId": "bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa",
"DispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21"
}
Expand Down
46 changes: 23 additions & 23 deletions pkg/scheduling/fixtures/affinity_soft.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"actionId": "child:process2"
},
{
"id": "aed946be-43db-4b5f-876a-c6c71f4d52aa",
"id": "aed946be-43db-4b5f-876a-c6c71f4d52aa",
"workerId": "bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa",
"dispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21",
"actionId": "child:process2"
},
{
"id": "e2c744b8-43db-4b5f-876a-c6c71f4d52aa",
"id": "e2c744b8-43db-4b5f-876a-c6c71f4d52aa",
"workerId": "bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa",
"dispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21",
"actionId": "child:process2"
Expand All @@ -31,7 +31,7 @@
"QueueItems": [
{
"id": 137295,
"stepRunId": "16fa711e-c03e-435c-88d9-62adf1591d98",
"stepRunId": 24,
"stepId": "29fae13a-6672-48cb-9aed-3b0bf481f570",
"actionId": "child:process2",
"scheduleTimeoutAt": "2024-08-07T19:43:30.692Z",
Expand All @@ -43,7 +43,7 @@
},
{
"id": 152259,
"stepRunId": "064e787a-6cfd-4f82-8b6d-d8031459fdee",
"stepRunId": 6,
"stepId": "e2c744b8-bebb-4b05-8292-d2ce36f27928",
"actionId": "child:process2",
"scheduleTimeoutAt": "2024-08-07T21:12:49.56Z",
Expand All @@ -69,23 +69,23 @@
]
},
"StepDesiredLabels": {
"29fae13a-6672-48cb-9aed-3b0bf481f570": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "A",
"Required": false,
"Weight": 1
}
],
"e2c744b8-bebb-4b05-8292-d2ce36f27928": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "B",
"Required": false,
"Weight": 1
}
]
}
"29fae13a-6672-48cb-9aed-3b0bf481f570": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "A",
"Required": false,
"Weight": 1
}
],
"e2c744b8-bebb-4b05-8292-d2ce36f27928": [
{
"Key": "MODEL",
"Comparator": "EQUAL",
"StrValue": "B",
"Required": false,
"Weight": 1
}
]
}
}
8 changes: 4 additions & 4 deletions pkg/scheduling/fixtures/affinity_soft_output.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"StepRunIds": [
"16fa711e-c03e-435c-88d9-62adf1591d98",
"064e787a-6cfd-4f82-8b6d-d8031459fdee"
24,
6
],
"StepRunTimeouts": [
"60s",
Expand All @@ -18,12 +18,12 @@
"UnassignedStepRunIds": [],
"QueuedStepRuns": [
{
"StepRunId": "16fa711e-c03e-435c-88d9-62adf1591d98",
"StepRunId": 24,
"WorkerId": "aaaaaaaa-43db-4b5f-876a-c6c71f4d52aa",
"DispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21"
},
{
"StepRunId": "064e787a-6cfd-4f82-8b6d-d8031459fdee",
"StepRunId": 6,
"WorkerId": "bbbbbbbb-43db-4b5f-876a-c6c71f4d52aa",
"DispatcherId": "9994a9eb-430d-46da-934d-d9dd953cfd21"
}
Expand Down
Loading

0 comments on commit 32ab35a

Please sign in to comment.