Sync with 2.35.8

[thirdparty/git.git] / ci / lib.sh

diff --git a/ci/lib.sh b/ci/lib.sh
index 86e37da9bc50abeda8082ae374b960da845073fb..916057a46782ce95f6bee2df9744a8e22bd35f2c 100755 (executable)
--- a/ci/lib.sh
+++ b/ci/lib.sh
@@ -157,18 +157,18 @@ export GIT_TEST_CLONE_2GB=true
 export SKIP_DASHED_BUILT_INS=YesPlease
 
 case "$runs_on_pool" in
-ubuntu-latest)
+ubuntu-*)
        if test "$jobname" = "linux-gcc-default"
        then
                break
        fi
 
+       PYTHON_PACKAGE=python2
        if [ "$jobname" = linux-gcc ]
        then
-               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3"
-       else
-               MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2"
+               PYTHON_PACKAGE=python3
        fi
+       MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/$PYTHON_PACKAGE"
 
        export GIT_TEST_HTTPD=true
 
@@ -177,7 +177,6 @@ ubuntu-latest)
        # were recorded in the Homebrew database upon creating the OS X
        # image.
        # Keep that in mind when you encounter a broken OS X build!
-       export LINUX_P4_VERSION="16.2"
        export LINUX_GIT_LFS_VERSION="1.5.2"
 
        P4_PATH="$HOME/custom/p4"