Skip to content

cwltool bump and temporary GPU test disablement [BA-6535] #5601

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
mcovarr merged 12 commits into from
Aug 3, 2020
Merged

cwltool bump and temporary GPU test disablement [BA-6535] #5601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a840f1b
bump [force ci]
mcovarr Jul 30, 2020
95b4c96
troublemaker
mcovarr Jul 30, 2020
6bcf6f3
python 3
mcovarr Jul 31, 2020
c9fc8f1
expt
mcovarr Jul 31, 2020
834e730
pick a version that's actually on the image
mcovarr Jul 31, 2020
db62dda
annoying
mcovarr Jul 31, 2020
0f35d38
tf
mcovarr Jul 31, 2020
c4e9dd2
not the prettiest
mcovarr Jul 31, 2020
0d483cc
tidy
mcovarr Jul 31, 2020
4951442
cleanup
mcovarr Jul 31, 2020
00d472b
temporarily turn off broken GPU tests
mcovarr Aug 3, 2020
4998cce
hopefully more robust monitoring and expectations
mcovarr Aug 3, 2020
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 .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ before_cache:
- find $HOME/.coursier/cache -name "ivydata-*.properties" -print -delete
- find $HOME/.sbt -name "*.lock" -print -delete
env:
global:
- PYTHON3_HOME=/opt/python/3.7.1
- PATH=$PYTHON3_HOME/bin\:$PATH
matrix:
# Setting this variable twice will cause the 'script' section to run twice with the respective env var invoked
- >-
Expand Down
1 change: 1 addition & 0 deletions centaur/src/main/resources/standardTestCases/gpu_cuda_image.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: gpu_cuda_image
testFormat: workflowsuccess
backends: [Papi]
ignore: true

files {
workflow: gpu_on_papi/gpu_cuda_image.wdl
Expand Down
1 change: 1 addition & 0 deletions centaur/src/main/resources/standardTestCases/gpu_on_papi_valid.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: gpu_on_papi_valid
testFormat: workflowsuccess
backends: [Papi]
ignore: true

files {
workflow: gpu_on_papi/gpu_on_papi.wdl
Expand Down
2 changes: 1 addition & 1 deletion centaur/src/main/resources/standardTestCases/monitoring_log/monitoring_log.options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"monitoring_script": "gs://cloud-cromwell-dev/some/rounding_script.sh"
"monitoring_script": "gs://cloud-cromwell-dev/some/rounding_script_int.sh"
}
4 changes: 2 additions & 2 deletions centaur/src/main/resources/standardTestCases/monitoring_log_papiv1.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ files {
}

metadata {
"calls.monitoring_log.get_stats.jes.monitoringScript": "gs://cloud-cromwell-dev/some/rounding_script.sh"
"calls.monitoring_log.get_stats.jes.monitoringScript": "gs://cloud-cromwell-dev/some/rounding_script_int.sh"
"calls.monitoring_log.get_stats.monitoringLog": "gs://cloud-cromwell-dev-self-cleaning/cromwell_execution/ci/monitoring_log/<<UUID>>/call-get_stats/monitoring.log"
"outputs.monitoring_log.get_stats.stats.0": "CPU: 1"
"outputs.monitoring_log.get_stats.stats.1": "Total Memory: 4G"
"outputs.monitoring_log.get_stats.stats.2": "Total Disk space: 9.8G"
"outputs.monitoring_log.get_stats.stats.2": "Total Disk space: 9G"
}
4 changes: 2 additions & 2 deletions centaur/src/main/resources/standardTestCases/monitoring_log_papiv2.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ files {
}

metadata {
"calls.monitoring_log.get_stats.jes.monitoringScript": "gs://cloud-cromwell-dev/some/rounding_script.sh"
"calls.monitoring_log.get_stats.jes.monitoringScript": "gs://cloud-cromwell-dev/some/rounding_script_int.sh"
"calls.monitoring_log.get_stats.monitoringLog": "gs://cloud-cromwell-dev-self-cleaning/cromwell_execution/ci/monitoring_log/<<UUID>>/call-get_stats/monitoring.log"
"outputs.monitoring_log.get_stats.stats.0": "CPU: 1"
"outputs.monitoring_log.get_stats.stats.1": "Total Memory: 2G"
"outputs.monitoring_log.get_stats.stats.2": "Total Disk space: 9.8G"
"outputs.monitoring_log.get_stats.stats.2": "Total Disk space: 9G"
}
4 changes: 2 additions & 2 deletions src/ci/bin/test.inc.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,7 @@ cromwell::private::create_centaur_variables() {

cromwell::private::create_conformance_variables() {
CROMWELL_BUILD_CWL_RUNNER_MODE="${CROMWELL_BUILD_BACKEND_TYPE}"
CROMWELL_BUILD_CWL_TOOL_VERSION="1.0.20190228155703"
CROMWELL_BUILD_CWL_TOOL_VERSION="3.0.20200724003302"
CROMWELL_BUILD_CWL_TEST_VERSION="1.0.20190228134645"
CROMWELL_BUILD_CWL_TEST_COMMIT="1f501e38ff692a408e16b246ac7d64d32f0822c2" # use known git hash to avoid changes
CROMWELL_BUILD_CWL_TEST_RUNNER="${CROMWELL_BUILD_ROOT_DIRECTORY}/centaurCwlRunner/src/bin/centaur-cwl-runner.bash"
Expand Down Expand Up @@ -700,7 +700,7 @@ cromwell::private::pip_install() {
pip_package="${1:?pip_install called without a package}"; shift

if [[ "${CROMWELL_BUILD_IS_CI}" == "true" ]]; then
sudo -H pip install "${pip_package}" "$@"
sudo -H "${PYTHON3_HOME}/bin/pip" install "${pip_package}" "$@"
elif [[ "${CROMWELL_BUILD_IS_VIRTUAL_ENV}" == "true" ]]; then
pip install "${pip_package}" "$@"
else
Expand Down
1 change: 1 addition & 0 deletions src/ci/resources/local_conformance_expected_failures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
104
136
140
142
Expand Down
1 change: 1 addition & 0 deletions src/ci/resources/papi_v2alpha1_conformance_expected_failures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
87
101
102
104
107
136
137
Expand Down
1 change: 1 addition & 0 deletions src/ci/resources/papi_v2beta_conformance_expected_failures.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
87
101
102
104
107
136
137
Expand Down