diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ebafe51064c..61ed3c5af41 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -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 diff --git a/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_jes.test b/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_jes.test index 1ac12322f4f..182a833fbdb 100644 --- a/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_jes.test +++ b/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_jes.test @@ -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 diff --git a/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_local.test b/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_local.test index f686b16c817..58abbf78245 100644 --- a/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_local.test +++ b/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_local.test @@ -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 diff --git a/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_tes.test b/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_tes.test index 64ea5fd8906..9bb9c1a55d6 100644 --- a/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_tes.test +++ b/centaur/src/main/resources/standardTestCases/failures.restart_while_failing_tes.test @@ -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 diff --git a/src/ci/bin/testCentaurHoricromtalPapiV2beta.sh b/src/ci/bin/testCentaurHoricromtalPapiV2beta.sh index 36b215a2f52..c894909cd3f 100755 --- a/src/ci/bin/testCentaurHoricromtalPapiV2beta.sh +++ b/src/ci/bin/testCentaurHoricromtalPapiV2beta.sh @@ -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 diff --git a/src/ci/bin/testCentaurPapiV2beta.sh b/src/ci/bin/testCentaurPapiV2beta.sh index 43d5a7d62aa..d66d2a14334 100755 --- a/src/ci/bin/testCentaurPapiV2beta.sh +++ b/src/ci/bin/testCentaurPapiV2beta.sh @@ -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 diff --git a/src/ci/bin/testCentaurPapiV2betaRestart.sh b/src/ci/bin/testCentaurPapiV2betaRestart.sh new file mode 100755 index 00000000000..e0d50bb18c6 --- /dev/null +++ b/src/ci/bin/testCentaurPapiV2betaRestart.sh @@ -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 diff --git a/src/ci/resources/papi_v2beta_restart_application.conf b/src/ci/resources/papi_v2beta_restart_application.conf new file mode 100644 index 00000000000..2f0bb75860b --- /dev/null +++ b/src/ci/resources/papi_v2beta_restart_application.conf @@ -0,0 +1 @@ +include "papi_v2beta_application.conf"