Merge from upstream and resolve conflict apache#2

zxy844288792 · Jan 13, 2022 · 50be44e · 50be44e
1 parent e1dfc37
commit 50be44e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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