ci/linux32: parameterise command to switch arch

In a later patch, the remaining of this command will be re-used for the
CI job for linux with musl libc.

Allow customisation of the emulator, now.

Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh
index 7f985615c290811f607b9e7b71dfe1cf07b7d64b..44bb332f6487446e58fbdb3735c0558ee6843481 100755 (executable)
--- a/ci/run-linux32-build.sh
+++ b/ci/run-linux32-build.sh
@@ -14,8 +14,17 @@ then
        exit 1
 fi
 
+case "$jobname" in
+Linux32)
+       switch_cmd="linux32 --32bit i386"
+       ;;
+*)
+       exit 1
+       ;;
+esac
+
 # Update packages to the latest available versions
-linux32 --32bit i386 sh -c '
+command $switch_cmd sh -c '
     apt update >/dev/null &&
     apt install -y build-essential libcurl4-openssl-dev libssl-dev \
        libexpat-dev gettext python >/dev/null
@@ -51,7 +60,7 @@ else
 fi
 
 # Build and test
-linux32 --32bit i386 su -m -l $CI_USER -c "
+command $switch_cmd su -m -l $CI_USER -c "
        set -ex
        export DEVELOPER='$DEVELOPER'
        export DEFAULT_TEST_TARGET='$DEFAULT_TEST_TARGET'

diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh
index ebb18fa7472549340b7f4d08d8b374a8317d18ee..54186b6aa7eb875884fd0a0ee85f082998d9c4ed 100755 (executable)
--- a/ci/run-linux32-docker.sh
+++ b/ci/run-linux32-docker.sh
@@ -9,6 +9,7 @@ docker pull daald/ubuntu32:xenial
 
 # Use the following command to debug the docker build locally:
 # $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial
+# root@container:/# export jobname=<jobname>
 # root@container:/# /usr/src/git/ci/run-linux32-build.sh <host-user-id>
 
 container_cache_dir=/tmp/travis-cache
@@ -21,6 +22,7 @@ docker run \
        --env GIT_TEST_OPTS \
        --env GIT_TEST_CLONE_2GB \
        --env MAKEFLAGS \
+       --env jobname \
        --env cache_dir="$container_cache_dir" \
        --volume "${PWD}:/usr/src/git" \
        --volume "$cache_dir:$container_cache_dir" \