Skip to content

Commit

Permalink
Merge pull request #27 from bernt-matthias/max-run-time
Browse files Browse the repository at this point in the history
add option to limit test run time
  • Loading branch information
mvdbeek authored May 31, 2022
2 parents 5006863 + 0468a9a commit 3554b79
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 1 deletion.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ Optional inputs:
- `python-version`
- `additional-planemo-options`: additional options passed to `planemo test`, see for instance [here](https://github.com/galaxyproject/planemo-ci-action/blob/657582777416fc51b6171961d90dced7dacbeea2/.github/workflows/tools.yaml#L229)
- `galaxy-slots`: number of slots (threads) to use in Galaxy jobs (sets the `GALAXY_SLOTS` environment variable)
- `test_timeout`: Maximum runtime of a single test in seconds, default: 86400

Output:

Expand Down
4 changes: 4 additions & 0 deletions action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ inputs:
galaxy-slots:
description: 'Number of cores to be used for Galaxy jobs in planemo test'
default: '1'
test_timeout:
description: 'Maximum runtime of a single test in seconds, default: 0 means unlimited'
default: 86400
# inputs that are needed for testing this action
# not supposed to be used
github-event-name-override:
Expand Down Expand Up @@ -144,6 +147,7 @@ runs:
GITHUB_REF_OVERRIDE: ${{ inputs.github-ref-override }}
ADDITIONAL_PLANEMO_OPTIONS: ${{ inputs.additional-planemo-options }}
GALAXY_SLOTS: ${{ inputs.galaxy-slots }}
TEST_TIMEOUT: ${{ inputs.test_timeout }}

# see https://trstringer.com/github-actions-multiline-strings/
- run: |
Expand Down
2 changes: 1 addition & 1 deletion planemo_ci_actions.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -exo pipefail

PLANEMO_TEST_OPTIONS=("--database_connection" "$DATABASE_CONNECTION" "--galaxy_source" "https://github.com/$GALAXY_FORK/galaxy" "--galaxy_branch" "$GALAXY_BRANCH" "--galaxy_python_version" "$PYTHON_VERSION")
PLANEMO_TEST_OPTIONS=("--database_connection" "$DATABASE_CONNECTION" "--galaxy_source" "https://github.com/$GALAXY_FORK/galaxy" "--galaxy_branch" "$GALAXY_BRANCH" "--galaxy_python_version" "$PYTHON_VERSION" --test_timeout "$TEST_TIMEOUT")
PLANEMO_CONTAINER_DEPENDENCIES=("--biocontainers" "--no_dependency_resolution" "--no_conda_auto_init")
PLANEMO_WORKFLOW_OPTIONS=("--shed_tool_conf" "/cvmfs/main.galaxyproject.org/config/shed_tool_conf.xml" "--no_shed_install" "--tool_data_table" "/cvmfs/data.galaxyproject.org/byhand/location/tool_data_table_conf.xml" "--tool_data_table" "/cvmfs/data.galaxyproject.org/managed/location/tool_data_table_conf.xml" "--docker_extra_volume" "/cvmfs")
read -ra ADDITIONAL_PLANEMO_OPTIONS <<< "$ADDITIONAL_PLANEMO_OPTIONS"
Expand Down

0 comments on commit 3554b79

Please sign in to comment.