On Fri, May 03, 2024 at 08:48:03PM +0200, Patrick Steinhardt wrote: > On Fri, May 03, 2024 at 01:42:32PM -0500, Justin Tobler wrote: > > On 24/04/12 06:43AM, Patrick Steinhardt wrote: > > > Hi, > > > > > > here's the (hopefully last) version of my patch series that introduces > > > Git/JGit compatibility tests for the reftable format. Only a single > > > commit changed, where I fixed two typos and added a missing signoff. > > > > With 35e293e6 (Merge branch 'ps/ci-test-with-jgit' into next, > > 2024-05-01), I've noticed that a subset of the `test:linux` GitLab CI > > jobs have started failing on next. > > > > https://gitlab.com/gitlab-org/git/-/pipelines/1277877090 > > > > I'll take a look. > > Are you sure it's related to this merge? All failures are on > "ubuntu:latest", and the complaints are about the "python2" package > being missing. Given the recent release of Ubuntu 24.04, maybe the root > cause is that "python2" does not exist there anymore? > > Patrick Maybe we should do something like below patch. Basically, we start to acknowledge the fact that Python 2 is end of life and always use Python 3 on ubuntu:latest. We might go even further than that and only use Python 2 on ubuntu:20.04 and slowly phase out support for it. diff --git a/ci/lib.sh b/ci/lib.sh index 473a2d0348..3967a5af85 100755 --- a/ci/lib.sh +++ b/ci/lib.sh @@ -325,11 +325,18 @@ ubuntu-*) break fi - PYTHON_PACKAGE=python2 - if test "$jobname" = linux-gcc - then + case "$distro" in + ubuntu-latest) PYTHON_PACKAGE=python3 - fi + ;; + *) + PYTHON_PACKAGE=python2 + if test "$jobname" = linux-gcc + then + PYTHON_PACKAGE=python3 + fi + ;; + esac MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE" export GIT_TEST_HTTPD=true Patrick
Attachment:
signature.asc
Description: PGP signature
