git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/4] ci: use more recent linux32 image

From
Patrick Steinhardt <ps@pks.im>
Date
Sep 13, 2024, 05:39 UTC
Message-ID
<ZuPQBhgl0CRgxQ0g@pks.im>
In-Reply-To
<20240913045510.GA1194807@coredump.intra.peff.net>
On Fri, Sep 13, 2024 at 12:55:10AM -0400, Jeff King wrote:
Show 63 quoted lines
> On Thu, Sep 12, 2024 at 02:47:38PM +0200, Patrick Steinhardt wrote:
> 
> > On Thu, Sep 12, 2024 at 01:53:00PM +0200, Patrick Steinhardt wrote:
> > > On Thu, Sep 12, 2024 at 07:22:42AM -0400, Jeff King wrote:
> > > > On Thu, Sep 12, 2024 at 12:41:03PM +0200, Patrick Steinhardt wrote:
> > > And with that the [fixed] pipeline builds and executes our tests just
> > > fine. I didn't wait for tests to finish though.
> > > 
> > > Patrick
> > > 
> > > [here]: https://gitlab.com/gitlab-org/git/-/merge_requests/210
> > > [first]: https://gitlab.com/gitlab-org/git/-/jobs/7808775485
> > > [fixed]: https://gitlab.com/gitlab-org/git/-/jobs/7808836999
> > 
> > Most of the tests pass, except for t5559. Seems like it doesn't have
> > mod_http2. Maybe its Apache version is too old, or it needs to be
> > installed separately.
> 
> Yeah, according to "apt-file", there's no package which contains
> mod_http2.so. t5559 is supposed to notice that during webserver setup
> and just skip the script. Poking at it myself in a xenial container, I
> think it does do so correctly. So that's good.
> 
> But the CI environment switches GIT_TEST_HTTPD from "auto" to "true",
> turning a setup failure into an error. This is overall a good thing
> (since we'd notice if our apache setup breaks), but obviously is wrong
> here. Unfortunately we don't have a knob just for http2. So the best we
> can do is something like (might be whitespace-damaged, I just pasted it
> out of a container session):
> 
> diff --git a/ci/lib.sh b/ci/lib.sh
> index 51f8f59..0514f6a 100755
> --- a/ci/lib.sh
> +++ b/ci/lib.sh
> @@ -336,7 +336,15 @@ ubuntu-*)
> 	fi
> 	MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"
> 
> -	export GIT_TEST_HTTPD=true
> +	case "$distro" in
> +	ubuntu-16.04)
> +		# too old for http/2
> +		export GIT_TEST_HTTPD=auto
> +		;;
> +	*)
> +		export GIT_TEST_HTTPD=yes
> +		;;
> +	esac
> 
> 	# The Linux build installs the defined dependency versions below.
> 	# The OS X build installs much more recent versions, whichever
> 
> 
> That would still run the regular tests, and just turn the http2 failure
> into a "skip". But it does make me nervous that we'd break something for
> the non-http2 tests on that old platform and never realize it. So maybe
> we need a GIT_TEST_HTTP2 knob that defaults to the value of
> GIT_TEST_HTTPD. And then we can turn it off for 16.04, leave the regular
> one as "yes".
> 
> I assume you're collecting a few patches to make your new xenial job
> work. I think what I suggested above should be pretty easy to implement,
> but let me know if you'd like me to come up with something concrete.

Yeah, that does the job, thanks. Let me tie all of this into a neat package and post it as 5/4 on top of this patch series.

Patrick
Previous: Jeff KingNext: Jeff King
Message 16 of 24 in “ci: remove 'Upload failed tests' directories' step from linux32 jobs”
  1. ci: remove 'Upload failed tests' directories' step from linux32 jobsJunio C Hamano, Sep 9, 2024
  2. Junio C HamanoSep 11, 2024
  3. Jeff KingSep 12, 2024
  4. Jeff KingSep 12, 2024
  5. 0/4 make linux32 ci job work with recent actionsJeff King, Sep 12, 2024
  6. 1/4 ci: drop run-docker scriptsJeff King, Sep 12, 2024
  7. Patrick SteinhardtSep 12, 2024
  8. 2/4 ci: unify ubuntu and ubuntu32 dependenciesJeff King, Sep 12, 2024
  9. Patrick SteinhardtSep 12, 2024
  10. 3/4 ci: use more recent linux32 imageJeff King, Sep 12, 2024
  11. Patrick SteinhardtSep 12, 2024
  12. Jeff KingSep 12, 2024
  13. Patrick SteinhardtSep 12, 2024
  14. Patrick SteinhardtSep 12, 2024
  15. Jeff KingSep 13, 2024
  16. Patrick SteinhardtSep 13, 2024
  17. 4/4 ci: use regular action versions for linux32 jobJeff King, Sep 12, 2024
  18. Junio C HamanoSep 12, 2024
  19. 5/4 ci: add Ubuntu 16.04 job to GitLab CIPatrick Steinhardt, Sep 13, 2024
  20. Jeff KingSep 13, 2024
  21. Patrick SteinhardtSep 13, 2024
  22. Jeff KingSep 13, 2024
  23. Patrick SteinhardtSep 13, 2024
  24. Junio C HamanoSep 13, 2024

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.