Skip to content

Change default run step status to false #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neomatamune merged 2 commits into from
Sep 5, 2023
Merged

Change default run step status to false #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f47e444
Set testStep default value to false
neomatamune Sep 4, 2023
835f48b
Updated tests to follow new default
neomatamune Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scenariorun/src/main/kotlin/com/cosmotech/scenariorun/ContainerFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -902,7 +902,7 @@ class ContainerFactory(
}

private fun testStep(step: Boolean?): Boolean {
return step ?: true
return step ?: false
}

@Suppress("LongParameterList")
Expand Down
97 changes: 93 additions & 4 deletions scenariorun/src/test/kotlin/com/cosmotech/scenariorun/ContainerFactoryTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -797,8 +797,8 @@ class ContainerFactoryTests {
"CSM_ORGANIZATION_ID" to "Organizationid",
"CSM_WORKSPACE_ID" to "Workspaceid",
"CSM_SCENARIO_ID" to "Scenarioid",
"CSM_SEND_DATAWAREHOUSE_PARAMETERS" to "false",
"CSM_SEND_DATAWAREHOUSE_DATASETS" to "false",
"CSM_SEND_DATAWAREHOUSE_PARAMETERS" to "true",
"CSM_SEND_DATAWAREHOUSE_DATASETS" to "true",
"TWIN_CACHE_HOST" to "this_is_a_host",
"TWIN_CACHE_PORT" to "6973",
"TWIN_CACHE_PASSWORD" to "this_is_a_password",
Expand Down Expand Up @@ -3517,6 +3517,15 @@ class ContainerFactoryTests {
name = "Test Run",
csmSimulation = "TestSimulation",
computeSize = "highcpupool",
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3527,6 +3536,15 @@ class ContainerFactoryTests {
csmSimulation = "TestSimulation",
computeSize = "highcpu",
stackSteps = true,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3539,6 +3557,13 @@ class ContainerFactoryTests {
stackSteps = true,
sendDatasetsToDataWarehouse = false,
sendInputParametersToDataWarehouse = false,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3549,6 +3574,15 @@ class ContainerFactoryTests {
csmSimulation = "TestSimulation",
computeSize = "highcpu",
parameterGroups = mutableListOf("group1"),
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3557,6 +3591,15 @@ class ContainerFactoryTests {
id = "testruntemplate",
name = "Test Run",
csmSimulation = "TestSimulation",
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3566,6 +3609,15 @@ class ContainerFactoryTests {
name = "Test Run",
csmSimulation = "TestSimulation",
computeSize = "%NONE%",
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3575,7 +3627,16 @@ class ContainerFactoryTests {
id = "testruntemplate",
name = "Test Run",
csmSimulation = "TestSimulation",
sendDatasetsToDataWarehouse = false)
sendDatasetsToDataWarehouse = false,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

private fun getRunTemplateNoParametersSend(): RunTemplate {
Expand All @@ -3584,7 +3645,16 @@ class ContainerFactoryTests {
id = "testruntemplate",
name = "Test Run",
csmSimulation = "TestSimulation",
sendInputParametersToDataWarehouse = false)
sendInputParametersToDataWarehouse = false,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

private fun getRunTemplateOnlyRun(): RunTemplate {
Expand All @@ -3597,6 +3667,7 @@ class ContainerFactoryTests {
fetchScenarioParameters = false,
applyParameters = false,
validateData = false,
run = true,
sendDatasetsToDataWarehouse = false,
sendInputParametersToDataWarehouse = false,
preRun = false,
Expand All @@ -3615,6 +3686,15 @@ class ContainerFactoryTests {
preRunSource = RunTemplateStepSource.cloud,
runSource = RunTemplateStepSource.cloud,
postRunSource = RunTemplateStepSource.cloud,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3629,6 +3709,15 @@ class ContainerFactoryTests {
preRunSource = RunTemplateStepSource.local,
runSource = RunTemplateStepSource.local,
postRunSource = RunTemplateStepSource.local,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand Down
97 changes: 93 additions & 4 deletions scenariorun/src/test/kotlin/com/cosmotech/scenariorun/OktaContainerFactoryTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,8 +784,8 @@ class OktaContainerFactoryTests {
"CSM_ORGANIZATION_ID" to "Organizationid",
"CSM_WORKSPACE_ID" to "Workspaceid",
"CSM_SCENARIO_ID" to "Scenarioid",
"CSM_SEND_DATAWAREHOUSE_PARAMETERS" to "false",
"CSM_SEND_DATAWAREHOUSE_DATASETS" to "false",
"CSM_SEND_DATAWAREHOUSE_PARAMETERS" to "true",
"CSM_SEND_DATAWAREHOUSE_DATASETS" to "true",
"TWIN_CACHE_HOST" to "this_is_a_host",
"TWIN_CACHE_PORT" to "6973",
"TWIN_CACHE_PASSWORD" to "this_is_a_password",
Expand Down Expand Up @@ -3117,6 +3117,15 @@ class OktaContainerFactoryTests {
name = "Test Run",
csmSimulation = "TestSimulation",
computeSize = "highcpupool",
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3127,6 +3136,15 @@ class OktaContainerFactoryTests {
csmSimulation = "TestSimulation",
computeSize = "highcpu",
stackSteps = true,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3139,6 +3157,13 @@ class OktaContainerFactoryTests {
stackSteps = true,
sendDatasetsToDataWarehouse = false,
sendInputParametersToDataWarehouse = false,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3149,6 +3174,15 @@ class OktaContainerFactoryTests {
csmSimulation = "TestSimulation",
computeSize = "highcpu",
parameterGroups = mutableListOf("group1"),
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3157,6 +3191,15 @@ class OktaContainerFactoryTests {
id = "testruntemplate",
name = "Test Run",
csmSimulation = "TestSimulation",
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3166,6 +3209,15 @@ class OktaContainerFactoryTests {
name = "Test Run",
csmSimulation = "TestSimulation",
computeSize = "%NONE%",
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3175,7 +3227,16 @@ class OktaContainerFactoryTests {
id = "testruntemplate",
name = "Test Run",
csmSimulation = "TestSimulation",
sendDatasetsToDataWarehouse = false)
sendDatasetsToDataWarehouse = false,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

private fun getRunTemplateNoParametersSend(): RunTemplate {
Expand All @@ -3184,7 +3245,16 @@ class OktaContainerFactoryTests {
id = "testruntemplate",
name = "Test Run",
csmSimulation = "TestSimulation",
sendInputParametersToDataWarehouse = false)
sendInputParametersToDataWarehouse = false,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

private fun getRunTemplateOnlyRun(): RunTemplate {
Expand All @@ -3193,6 +3263,7 @@ class OktaContainerFactoryTests {
id = "testruntemplate",
name = "Test Run",
csmSimulation = "TestSimulation",
run = true,
fetchDatasets = false,
fetchScenarioParameters = false,
applyParameters = false,
Expand All @@ -3215,6 +3286,15 @@ class OktaContainerFactoryTests {
preRunSource = RunTemplateStepSource.cloud,
runSource = RunTemplateStepSource.cloud,
postRunSource = RunTemplateStepSource.cloud,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand All @@ -3229,6 +3309,15 @@ class OktaContainerFactoryTests {
preRunSource = RunTemplateStepSource.local,
runSource = RunTemplateStepSource.local,
postRunSource = RunTemplateStepSource.local,
fetchDatasets = true,
fetchScenarioParameters = true,
applyParameters = true,
validateData = true,
run = true,
sendDatasetsToDataWarehouse = true,
sendInputParametersToDataWarehouse = true,
preRun = true,
postRun = true,
)
}

Expand Down