Skip to content
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

WX-1351 Split out restart tests #7333

Merged
merged 4 commits into from
Dec 6, 2023
Merged

WX-1351 Split out restart tests #7333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
310704c
Break out restart tests
aednichols Dec 5, 2023
b586cdf
Fix execute bit on new script
aednichols Dec 5, 2023
2b3e020
Fix accidental tab
aednichols Dec 5, 2023
5338029
Fix missing config
aednichols Dec 5, 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
3 changes: 3 additions & 0 deletions .github/workflows/integration_tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ jobs:
- build_type: centaurPapiV2beta
build_mysql: 5.7
friendly_name: Centaur Papi V2 Beta with MySQL 5.7
- build_type: centaurPapiV2betaRestart
build_mysql: 5.7
friendly_name: Centaur Papi V2 Beta (restart)
- build_type: dbms
friendly_name: DBMS
- build_type: centaurTes
Expand Down
1 change: 1 addition & 0 deletions centaur/src/main/resources/standardTestCases/failures.restart_while_failing_jes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ name: failures.restart_while_failing_jes
testFormat: WorkflowFailureRestartWithRecover
callMark: restart_while_failing.B1
backends: [Papi]
tags: [restart]

files {
workflow: failures/restart_while_failing/restart_while_failing.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/failures.restart_while_failing_local.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ testFormat: WorkflowFailureRestartWithRecover
callMark: restart_while_failing.B1
backendsMode: "only"
backends: [Local, LocalNoDocker]
tags: [localdockertest]
tags: [localdockertest, restart]

files {
workflow: failures/restart_while_failing/restart_while_failing.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/failures.restart_while_failing_tes.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: failures.restart_while_failing_tes
testFormat: WorkflowFailureRestartWithoutRecover
callMark: restart_while_failing.B1
backends: [TES]
tags: [localdockertest]
tags: [localdockertest, restart]

files {
workflow: failures/restart_while_failing/restart_while_failing.wdl
Expand Down
1 change: 1 addition & 0 deletions src/ci/bin/testCentaurHoricromtalPapiV2beta.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ cromwell::build::run_centaur \
-e relative_output_paths_colliding \
-e standard_output_paths_colliding_prevented \
-e papi_v2alpha1_gcsa \
-e restart \

cromwell::build::generate_code_coverage

Expand Down
1 change: 1 addition & 0 deletions src/ci/bin/testCentaurPapiV2beta.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ cromwell::build::run_centaur \
-e relative_output_paths_colliding \
-e standard_output_paths_colliding_prevented \
-e papi_v2alpha1_gcsa \
-e restart \

cromwell::build::generate_code_coverage

Expand Down
25 changes: 25 additions & 0 deletions src/ci/bin/testCentaurPapiV2betaRestart.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/usr/bin/env bash

set -o errexit -o nounset -o pipefail
export CROMWELL_BUILD_REQUIRES_SECURE=true
# import in shellcheck / CI / IntelliJ compatible ways
# shellcheck source=/dev/null
source "${BASH_SOURCE%/*}/test.inc.sh" || source test.inc.sh
# shellcheck source=/dev/null
source "${BASH_SOURCE%/*}/test_papi.inc.sh" || source test_papi.inc.sh

cromwell::build::setup_common_environment

cromwell::build::setup_centaur_environment

cromwell::build::papi::setup_papi_centaur_environment

cromwell::build::assemble_jars

cromwell::build::run_centaur \
-p 100 \
-i restart \

cromwell::build::generate_code_coverage

cromwell::build::print_workflow_statistics
1 change: 1 addition & 0 deletions src/ci/resources/papi_v2beta_restart_application.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
include "papi_v2beta_application.conf"
Loading