Re: [PATCH 0/3] fixing expensive http test timeouts
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 29, 2026, 14:39 UTC
- Message-ID
- <xmqqldbxz9z4.fsf@gitster.g>
- In-Reply-To
- <akIfsaVMB_S6kfJQ@pks.im>
Patrick Steinhardt <ps@pks.im> writes:
> By the way, the only reason why we at GitLab haven't been feeling the > pain is that we only enable GIT_TEST_LONG for GitHub. So I was wondering > whether we want to have something like the below patch on top.
If we can afford the cycles, it would be good to have similarly larger coverage on two different platforms (compared to leaving one of them not doing as much as the other when we know it). On the other hand, if we cannot cover _everything_ in one platform, it may be a better use of the resources to have the other platform things that are not covered already. I see that among different pipeline sources, we are doing TEST_LONG for pull requests to any branch, and pushes only to "cast in stone" branches. If there are other branches that deserve to be tested with TEST_LONG upon other events that the existing GitHub Actions CI does not trigger, it may be good to have GitLab CI cover them, perhaps?
Show 45 quoted lines
>
> Patrick
>
> diff --git a/ci/lib.sh b/ci/lib.sh
> index b939110a6e..57801586aa 100755
> --- a/ci/lib.sh
> +++ b/ci/lib.sh
> @@ -215,6 +215,14 @@ then
> test macos != "$CI_OS_NAME" || CI_OS_NAME=osx
> CI_REPO_SLUG="$GITHUB_REPOSITORY"
> CI_JOB_ID="$GITHUB_RUN_ID"
> +
> + case "$GITHUB_EVENT_NAME" in
> + pull_request)
> + CI_EVENT=pull_request;;
> + push)
> + CI_EVENT=push;;
> + esac
> +
> CC="${CC_PACKAGE:-${CC:-gcc}}"
> DONT_SKIP_TAGS=t
> handle_failed_tests () {
> @@ -239,6 +247,13 @@ then
> CI_BRANCH="$CI_COMMIT_REF_NAME"
> CI_COMMIT="$CI_COMMIT_SHA"
>
> + case "$CI_PIPELINE_SOURCE" in
> + merge_request_event)
> + CI_EVENT=pull_request;;
> + push)
> + CI_EVENT=push;;
> + esac
> +
> case "$OS,$CI_JOB_IMAGE" in
> Windows_NT,*)
> CI_OS_NAME=windows
> @@ -319,7 +334,7 @@ export SKIP_DASHED_BUILT_INS=YesPlease
> # enable "expensive" tests for PR events.
> # In order to catch bugs introduced at integration time by mismerges,
> # enable the long tests for pushes to the integration branches as well.
> -case "$GITHUB_EVENT_NAME,$CI_BRANCH" in
> +case "$CI_EVENT,$CI_BRANCH" in
> pull_request,*|push,*next*|push,*master*|push,*main*|push,*maint*)
> export GIT_TEST_LONG=YesPlease
> ;;