From 50be44eddbdc807cd4f600df2636ca79767c778c Mon Sep 17 00:00:00 2001 From: Ramana Radhakrishnan Date: Wed, 7 Jul 2021 22:52:30 +0100 Subject: [PATCH] Merge from upstream and resolve conflict #2 --- Jenkinsfile | 1 - tests/scripts/task_python_arm_compute_library.sh | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 02bb52379e19..7c982369a3bd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -282,7 +282,6 @@ stage('Unit Test') { // timeout(time: max_time, unit: 'MINUTES') { // sh "${docker_run} ${ci_arm} ./tests/scripts/task_ci_setup.sh" // sh "${docker_run} ${ci_arm} ./tests/scripts/task_python_unittest.sh" - // sh "${docker_run} ${ci_arm} ./tests/scripts/task_python_arm_compute_library.sh" // junit "build/pytest-results/*.xml" // // sh "${docker_run} ${ci_arm} ./tests/scripts/task_python_integration.sh" // } diff --git a/tests/scripts/task_python_arm_compute_library.sh b/tests/scripts/task_python_arm_compute_library.sh index 7df894d93399..75380624572d 100755 --- a/tests/scripts/task_python_arm_compute_library.sh +++ b/tests/scripts/task_python_arm_compute_library.sh @@ -27,4 +27,5 @@ source tests/scripts/setup-pytest-env.sh find . -type f -path "*.pyc" | xargs rm -f make cython3 -run_pytest ctypes python-arm_compute_lib tests/python/contrib/test_arm_compute_lib +echo "Temporarily suspended while we understand flakiness with #8117" +#run_pytest ctypes python-arm_compute_lib tests/python/contrib/test_arm_compute_lib