Skip to content

Commit ae601fa

Browse files
sreenithicopybara-github
authored andcommitted
Fix Python linux distribtest for aarch64_alpine target and enable for presubmit test (grpc#39647)
Following the fix in grpc#39558 to separate the build job for musllinux_1_1_aarch64, looks like the distrib_target step was also not working mutually exclusive with the exclude filters as expected. The target `python_linux_aarch64_alpine` in the distrib_targets step should also only be part of the `grpc_distribtests_python_arm64` kokoro job but is wrongly getting executed as part of the `grpc_distribtests_python` kokoro job and hence failing on master currently. Hence updated the exclude filters to separate it. Also, the `python_linux_aarch64_alpine` distrib_target was not running as part of the presubmit tests, which is why this wasn't flagged earlier during the grpc#39558 PR. Given that we want to ensure the future build jobs stay separated and not cause release blockers, I think it would be better to enable this distrib target for presubmits. Have included this change too in this PR. Closes grpc#39647 COPYBARA_INTEGRATE_REVIEW=grpc#39647 from sreenithi:fix_distribtest_alpine 609ffde PiperOrigin-RevId: 762584247
1 parent 72ea42a commit ae601fa

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

tools/internal_ci/linux/grpc_distribtests_python.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ cp -r artifacts/* input_artifacts/ || true
6868
# Run all python linux distribtests
6969
# We run the distribtests even if some of the artifacts have failed to build, since that gives
7070
# a better signal about which distribtest are affected by the currently broken artifact builds.
71-
if [[ "${IS_AARCH64_MUSL}" == "True" ]]; then
72-
# We're using alpine as tag in distribtest targets.
73-
tools/run_tests/task_runner.py -f distribtest linux python aarch64 alpine -j 12 -x distribtests/sponge_log.xml || FAILED="true"
74-
else
75-
tools/run_tests/task_runner.py -f distribtest linux python ${TASK_RUNNER_EXTRA_FILTERS} -j 12 -x distribtests/sponge_log.xml || FAILED="true"
76-
fi
71+
72+
# We're using alpine as tag in distribtest targets for musllinux_1_1 artifacts, so exclude filters must use this tag
73+
DISTRIB_TASK_RUNNER_EXTRA_FILTERS="${TASK_RUNNER_EXTRA_FILTERS//musllinux_1_1/alpine}"
74+
75+
tools/run_tests/task_runner.py -f distribtest linux python ${DISTRIB_TASK_RUNNER_EXTRA_FILTERS} -j 12 -x distribtests/sponge_log.xml || FAILED="true"
7776

7877
# This step checks if any of the artifacts exceeds a per-file size limit.
7978
tools/internal_ci/helper_scripts/check_python_artifacts_size.sh

tools/run_tests/artifacts/distribtest_targets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ def targets():
461461
PythonDistribTest(
462462
"linux", "aarch64", "python39_buster", presubmit=True
463463
),
464-
PythonDistribTest("linux", "aarch64", "alpine"),
464+
PythonDistribTest("linux", "aarch64", "alpine", presubmit=True),
465465
PythonDistribTest(
466466
"linux", "x64", "alpine3.18", source=True, presubmit=True
467467
),

0 commit comments

Comments
 (0)