Skip to content

Commit f12feb4

Browse files
michel-guillonmichel-guillon
committed
Revert test changes du to Argo most recent version
1 parent 2dc7d10 commit f12feb4

File tree

1 file changed

+99
-99
lines changed

1 file changed

+99
-99
lines changed

‎scenariorun/src/test/kotlin/com/cosmotech/scenariorun/workflow/argo/WorkflowBuildersTests.kt‎

Lines changed: 99 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class WorkflowBuildersTests {
195195
val sc = getStartContainersRun()
196196
val workflowSpec = buildWorkflowSpec(csmPlatformProperties, sc, null)
197197

198-
assertEquals("runcontainer", workflowSpec.templates?.getOrNull(0)?.name)
198+
assertEquals("runContainer", workflowSpec.templates?.getOrNull(0)?.name)
199199
}
200200

201201
@Test
@@ -237,36 +237,36 @@ class WorkflowBuildersTests {
237237
val expected =
238238
listOf(
239239
IoArgoprojWorkflowV1alpha1DAGTask()
240-
.name("fetchdatasetcontainer-1")
241-
.template("fetchdatasetcontainer-1"),
240+
.name("fetchDatasetContainer-1")
241+
.template("fetchDatasetContainer-1"),
242242
IoArgoprojWorkflowV1alpha1DAGTask()
243-
.name("fetchscenarioparameterscontainer")
244-
.template("fetchscenarioparameterscontainer"),
243+
.name("fetchScenarioParametersContainer")
244+
.template("fetchScenarioParametersContainer"),
245245
IoArgoprojWorkflowV1alpha1DAGTask()
246-
.name("applyparameterscontainer")
247-
.template("applyparameterscontainer")
246+
.name("applyParametersContainer")
247+
.template("applyParametersContainer")
248248
.dependencies(
249-
listOf("fetchdatasetcontainer-1", "fetchscenarioparameterscontainer")),
249+
listOf("fetchDatasetContainer-1", "fetchScenarioParametersContainer")),
250250
IoArgoprojWorkflowV1alpha1DAGTask()
251-
.name("validatedatacontainer")
252-
.template("validatedatacontainer")
253-
.dependencies(listOf("applyparameterscontainer")),
251+
.name("validateDataContainer")
252+
.template("validateDataContainer")
253+
.dependencies(listOf("applyParametersContainer")),
254254
IoArgoprojWorkflowV1alpha1DAGTask()
255-
.name("senddatawarehousecontainer")
256-
.template("senddatawarehousecontainer")
257-
.dependencies(listOf("validatedatacontainer")),
255+
.name("sendDataWarehouseContainer")
256+
.template("sendDataWarehouseContainer")
257+
.dependencies(listOf("validateDataContainer")),
258258
IoArgoprojWorkflowV1alpha1DAGTask()
259-
.name("preruncontainer")
260-
.template("preruncontainer")
261-
.dependencies(listOf("validatedatacontainer")),
259+
.name("preRunContainer")
260+
.template("preRunContainer")
261+
.dependencies(listOf("validateDataContainer")),
262262
IoArgoprojWorkflowV1alpha1DAGTask()
263-
.name("runcontainer")
264-
.template("runcontainer")
265-
.dependencies(listOf("preruncontainer")),
263+
.name("runContainer")
264+
.template("runContainer")
265+
.dependencies(listOf("preRunContainer")),
266266
IoArgoprojWorkflowV1alpha1DAGTask()
267-
.name("postruncontainer")
268-
.template("postruncontainer")
269-
.dependencies(listOf("runcontainer")),
267+
.name("postRunContainer")
268+
.template("postRunContainer")
269+
.dependencies(listOf("runContainer")),
270270
)
271271

272272
assertEquals(expected, entrypointTemplate?.dag?.tasks)
@@ -282,36 +282,36 @@ class WorkflowBuildersTests {
282282
val expected =
283283
listOf(
284284
IoArgoprojWorkflowV1alpha1DAGTask()
285-
.name("fetchdatasetcontainer-1")
286-
.template("fetchdatasetcontainer-1"),
285+
.name("fetchDatasetContainer-1")
286+
.template("fetchDatasetContainer-1"),
287287
IoArgoprojWorkflowV1alpha1DAGTask()
288-
.name("fetchscenarioparameterscontainer")
289-
.template("fetchscenarioparameterscontainer")
290-
.dependencies(listOf("fetchdatasetcontainer-1")),
288+
.name("fetchScenarioParametersContainer")
289+
.template("fetchScenarioParametersContainer")
290+
.dependencies(listOf("fetchDatasetContainer-1")),
291291
IoArgoprojWorkflowV1alpha1DAGTask()
292-
.name("applyparameterscontainer")
293-
.template("applyparameterscontainer")
294-
.dependencies(listOf("fetchscenarioparameterscontainer")),
292+
.name("applyParametersContainer")
293+
.template("applyParametersContainer")
294+
.dependencies(listOf("fetchScenarioParametersContainer")),
295295
IoArgoprojWorkflowV1alpha1DAGTask()
296-
.name("validatedatacontainer")
297-
.template("validatedatacontainer")
298-
.dependencies(listOf("applyparameterscontainer")),
296+
.name("validateDataContainer")
297+
.template("validateDataContainer")
298+
.dependencies(listOf("applyParametersContainer")),
299299
IoArgoprojWorkflowV1alpha1DAGTask()
300-
.name("senddatawarehousecontainer")
301-
.template("senddatawarehousecontainer")
302-
.dependencies(listOf("validatedatacontainer")),
300+
.name("sendDataWarehouseContainer")
301+
.template("sendDataWarehouseContainer")
302+
.dependencies(listOf("validateDataContainer")),
303303
IoArgoprojWorkflowV1alpha1DAGTask()
304-
.name("preruncontainer")
305-
.template("preruncontainer")
306-
.dependencies(listOf("senddatawarehousecontainer")),
304+
.name("preRunContainer")
305+
.template("preRunContainer")
306+
.dependencies(listOf("sendDataWarehouseContainer")),
307307
IoArgoprojWorkflowV1alpha1DAGTask()
308-
.name("runcontainer")
309-
.template("runcontainer")
310-
.dependencies(listOf("preruncontainer")),
308+
.name("runContainer")
309+
.template("runContainer")
310+
.dependencies(listOf("preRunContainer")),
311311
IoArgoprojWorkflowV1alpha1DAGTask()
312-
.name("postruncontainer")
313-
.template("postruncontainer")
314-
.dependencies(listOf("runcontainer")),
312+
.name("postRunContainer")
313+
.template("postRunContainer")
314+
.dependencies(listOf("runContainer")),
315315
)
316316

317317
assertEquals(expected, entrypointTemplate?.dag?.tasks)
@@ -327,13 +327,13 @@ class WorkflowBuildersTests {
327327
val expected =
328328
listOf(
329329
null,
330-
"fetchdatasetcontainer-1",
331-
"fetchscenarioparameterscontainer",
332-
"applyparameterscontainer",
333-
"validatedatacontainer",
334-
"senddatawarehousecontainer",
335-
"preruncontainer",
336-
"runcontainer",
330+
"fetchDatasetContainer-1",
331+
"fetchScenarioParametersContainer",
332+
"applyParametersContainer",
333+
"validateDataContainer",
334+
"sendDataWarehouseContainer",
335+
"preRunContainer",
336+
"runContainer",
337337
)
338338

339339
val dependencies =
@@ -351,19 +351,19 @@ class WorkflowBuildersTests {
351351
workflowSpec.templates?.find { template -> template.name.equals("entrypoint") }
352352
val expected =
353353
listOf(
354-
IoArgoprojWorkflowV1alpha1DAGTask().name("diamond-a").template("diamond-a"),
354+
IoArgoprojWorkflowV1alpha1DAGTask().name("Diamond-A").template("Diamond-A"),
355355
IoArgoprojWorkflowV1alpha1DAGTask()
356-
.name("diamond-b")
357-
.template("diamond-b")
358-
.dependencies(listOf("diamond-a")),
356+
.name("Diamond-B")
357+
.template("Diamond-B")
358+
.dependencies(listOf("Diamond-A")),
359359
IoArgoprojWorkflowV1alpha1DAGTask()
360-
.name("diamond-c")
361-
.template("diamond-c")
362-
.dependencies(listOf("diamond-a")),
360+
.name("Diamond-C")
361+
.template("Diamond-C")
362+
.dependencies(listOf("Diamond-A")),
363363
IoArgoprojWorkflowV1alpha1DAGTask()
364-
.name("diamond-d")
365-
.template("diamond-d")
366-
.dependencies(listOf("diamond-b", "diamond-c")),
364+
.name("Diamond-D")
365+
.template("Diamond-D")
366+
.dependencies(listOf("Diamond-B", "Diamond-C")),
367367
)
368368

369369
assertEquals(expected, entrypointTemplate?.dag?.tasks)
@@ -451,7 +451,7 @@ class WorkflowBuildersTests {
451451
val sc = getStartContainersWithLabels()
452452
val workflow = buildWorkflowSpec(csmPlatformProperties, sc, null)
453453
val labeledTemplate =
454-
workflow.templates?.find { template -> template.name.equals("fetchdatasetcontainer-1") }
454+
workflow.templates?.find { template -> template.name.equals("fetchDatasetContainer-1") }
455455

456456
val expected =
457457
mapOf(
@@ -549,15 +549,15 @@ class WorkflowBuildersTests {
549549
val sc =
550550
ScenarioRunStartContainers(
551551
nodeLabel = "highcpupool",
552-
containers = listOf(getScenarioRunContainerEntrypoint("runcontainer")),
552+
containers = listOf(getScenarioRunContainerEntrypoint("runContainer")),
553553
csmSimulationId = csmSimulationId)
554554
return sc
555555
}
556556

557557
private fun getStartContainersRunNoPool(): ScenarioRunStartContainers {
558558
val sc =
559559
ScenarioRunStartContainers(
560-
containers = listOf(getScenarioRunContainerEntrypoint("runcontainer")),
560+
containers = listOf(getScenarioRunContainerEntrypoint("runContainer")),
561561
csmSimulationId = csmSimulationId)
562562
return sc
563563
}
@@ -568,14 +568,14 @@ class WorkflowBuildersTests {
568568
nodeLabel = "highcpupool",
569569
containers =
570570
listOf(
571-
getScenarioRunContainer("fetchdatasetcontainer-1"),
572-
getScenarioRunContainer("fetchscenarioparameterscontainer"),
573-
getScenarioRunContainerEntrypoint("applyparameterscontainer"),
574-
getScenarioRunContainerEntrypoint("validatedatacontainer"),
575-
getScenarioRunContainer("senddatawarehousecontainer"),
576-
getScenarioRunContainerEntrypoint("preruncontainer"),
577-
getScenarioRunContainerEntrypoint("runcontainer"),
578-
getScenarioRunContainerEntrypoint("postruncontainer"),
571+
getScenarioRunContainer("fetchDatasetContainer-1"),
572+
getScenarioRunContainer("fetchScenarioParametersContainer"),
573+
getScenarioRunContainerEntrypoint("applyParametersContainer"),
574+
getScenarioRunContainerEntrypoint("validateDataContainer"),
575+
getScenarioRunContainer("sendDataWarehouseContainer"),
576+
getScenarioRunContainerEntrypoint("preRunContainer"),
577+
getScenarioRunContainerEntrypoint("runContainer"),
578+
getScenarioRunContainerEntrypoint("postRunContainer"),
579579
),
580580
csmSimulationId = csmSimulationId)
581581
return sc
@@ -588,20 +588,20 @@ class WorkflowBuildersTests {
588588
containers =
589589
listOf(
590590
getScenarioRunContainerDependencies(
591-
"fetchdatasetcontainer-1", listOf("DAG_ROOT")),
591+
"fetchDatasetContainer-1", listOf("DAG_ROOT")),
592592
getScenarioRunContainerDependencies(
593-
"fetchscenarioparameterscontainer", listOf("DAG_ROOT")),
593+
"fetchScenarioParametersContainer", listOf("DAG_ROOT")),
594594
getScenarioRunContainerEntrypointDependencies(
595-
"applyparameterscontainer",
596-
listOf("fetchdatasetcontainer-1", "fetchscenarioparameterscontainer")),
595+
"applyParametersContainer",
596+
listOf("fetchDatasetContainer-1", "fetchScenarioParametersContainer")),
597597
getScenarioRunContainerEntrypointDependencies(
598-
"validatedatacontainer", listOf("applyparameterscontainer")),
598+
"validateDataContainer", listOf("applyParametersContainer")),
599599
getScenarioRunContainerDependencies(
600-
"senddatawarehousecontainer", listOf("validatedatacontainer")),
600+
"sendDataWarehouseContainer", listOf("validateDataContainer")),
601601
getScenarioRunContainerEntrypointDependencies(
602-
"preruncontainer", listOf("validatedatacontainer")),
603-
getScenarioRunContainerEntrypoint("runcontainer"),
604-
getScenarioRunContainerEntrypoint("postruncontainer"),
602+
"preRunContainer", listOf("validateDataContainer")),
603+
getScenarioRunContainerEntrypoint("runContainer"),
604+
getScenarioRunContainerEntrypoint("postRunContainer"),
605605
),
606606
csmSimulationId = csmSimulationId)
607607
return sc
@@ -613,14 +613,14 @@ class WorkflowBuildersTests {
613613
nodeLabel = "highcpupool",
614614
containers =
615615
listOf(
616-
getScenarioRunContainerWithLabels("fetchdatasetcontainer-1"),
617-
getScenarioRunContainer("fetchscenarioparameterscontainer"),
618-
getScenarioRunContainerEntrypoint("applyparameterscontainer"),
619-
getScenarioRunContainerEntrypoint("validatedatacontainer"),
620-
getScenarioRunContainer("senddatawarehousecontainer"),
621-
getScenarioRunContainerEntrypoint("preruncontainer"),
622-
getScenarioRunContainerEntrypoint("runcontainer"),
623-
getScenarioRunContainerEntrypoint("postruncontainer"),
616+
getScenarioRunContainerWithLabels("fetchDatasetContainer-1"),
617+
getScenarioRunContainer("fetchScenarioParametersContainer"),
618+
getScenarioRunContainerEntrypoint("applyParametersContainer"),
619+
getScenarioRunContainerEntrypoint("validateDataContainer"),
620+
getScenarioRunContainer("sendDataWarehouseContainer"),
621+
getScenarioRunContainerEntrypoint("preRunContainer"),
622+
getScenarioRunContainerEntrypoint("runContainer"),
623+
getScenarioRunContainerEntrypoint("postRunContainer"),
624624
),
625625
csmSimulationId = csmSimulationId)
626626
return sc
@@ -633,14 +633,14 @@ class WorkflowBuildersTests {
633633
nodeLabel = "highcpupool",
634634
containers =
635635
listOf(
636-
getScenarioRunContainer("fetchdatasetcontainer-1"),
637-
getScenarioRunContainer("fetchscenarioparameterscontainer"),
638-
getScenarioRunContainerEntrypoint("applyparameterscontainer"),
639-
getScenarioRunContainerEntrypoint("validatedatacontainer"),
640-
getScenarioRunContainer("senddatawarehousecontainer"),
641-
getScenarioRunContainerEntrypoint("preruncontainer"),
642-
getScenarioRunContainerEntrypoint("runcontainer"),
643-
getScenarioRunContainerEntrypoint("postruncontainer"),
636+
getScenarioRunContainer("fetchDatasetContainer-1"),
637+
getScenarioRunContainer("fetchScenarioParametersContainer"),
638+
getScenarioRunContainerEntrypoint("applyParametersContainer"),
639+
getScenarioRunContainerEntrypoint("validateDataContainer"),
640+
getScenarioRunContainer("sendDataWarehouseContainer"),
641+
getScenarioRunContainerEntrypoint("preRunContainer"),
642+
getScenarioRunContainerEntrypoint("runContainer"),
643+
getScenarioRunContainerEntrypoint("postRunContainer"),
644644
),
645645
csmSimulationId = csmSimulationId)
646646
return sc

0 commit comments

Comments
 (0)