From bbe089615f0edf4641cb0aa401e0c5055f7d2e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0pa=C4=8Dek?= Date: Wed, 1 Jun 2022 13:46:02 +0200 Subject: [PATCH] Unify Python interpreter used by TSAN and JUnit helpers Reportedly we don't have python2-enabled TSAN builds, so we can remove one more hardcoded python3 call from .gitlab-ci.yaml. (cherry picked from commit 8d095550a8ebf70cc33953a2dd2f7bf150c900dc) --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 072a51ff10..c6fa24ce16 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -338,8 +338,8 @@ stages: <<: *system_test_common after_script: - cat bin/tests/system/test-suite.log - - find bin -name 'tsan.*' -exec python3 util/parse_tsan.py {} \; - *find_python + - find bin -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \; - > "$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml artifacts: @@ -383,8 +383,8 @@ stages: .unit_test_tsan: &unit_test_tsan_job <<: *unit_test_common after_script: - - find lib -name 'tsan.*' -exec python3 util/parse_tsan.py {} \; - *find_python + - find lib -name 'tsan.*' -exec "$PYTHON" util/parse_tsan.py {} \; - > "$PYTHON" bin/tests/convert-trs-to-junit.py . > "$CI_PROJECT_DIR"/junit.xml artifacts: