CI: Remove vestigial support for re-running tests in a Docker container

Travis CI needed this, but Gitlab-CI always runs our tests in a Docker
container of our choice, so there's never any need to enter another
(and it's not allowed anyway).

Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit dfa7eede446de6c2711cb6b2e5a91667880d2c22)

diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index f286baa7221830e769e04641223bf82bb76205dd..989fab252ad1913c9a2ccae708ddefcb7df60119 100755 (executable)
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -82,15 +82,6 @@ init_wine() {
 # Typical values: ubuntu, debian; maybe fedora in future
 : "${ci_distro:=ubuntu}"
 
-# ci_docker:
-# If non-empty, this is the name of a Docker image. ci-install.sh will
-# fetch it with "docker pull" and use it as a base for a new Docker image
-# named "ci-image" in which we will do our testing.
-#
-# If empty, we test on "bare metal".
-# Typical values: ubuntu:xenial, debian:jessie-slim
-: "${ci_docker:=}"
-
 # ci_host:
 # See ci-install.sh
 : "${ci_host:=native}"
@@ -130,23 +121,7 @@ init_wine() {
 # One of static, shared; used for windows cross builds
 : "${ci_runtime:=static}"
 
-echo "ci_buildsys=$ci_buildsys ci_distro=$ci_distro ci_docker=$ci_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_parallel=$ci_parallel ci_suite=$ci_suite ci_test=$ci_test ci_test_fatal=$ci_test_fatal ci_variant=$ci_variant ci_runtime=$ci_runtime $0"
-
-if [ -n "$ci_docker" ]; then
-    exec docker run \
-        --env=ci_buildsys="${ci_buildsys}" \
-        --env=ci_docker="" \
-        --env=ci_host="${ci_host}" \
-        --env=ci_parallel="${ci_parallel}" \
-        --env=ci_sudo=yes \
-        --env=ci_test="${ci_test}" \
-        --env=ci_test_fatal="${ci_test_fatal}" \
-        --env=ci_variant="${ci_variant}" \
-        --env=ci_runtime="${ci_runtime}" \
-        --privileged \
-        ci-image \
-        tools/ci-build.sh
-fi
+echo "ci_buildsys=$ci_buildsys ci_distro=$ci_distro ci_host=$ci_host ci_local_packages=$ci_local_packages ci_parallel=$ci_parallel ci_suite=$ci_suite ci_test=$ci_test ci_test_fatal=$ci_test_fatal ci_variant=$ci_variant ci_runtime=$ci_runtime $0"
 
 maybe_fail_tests () {
     if [ "$ci_test_fatal" = yes ]; then

diff --git a/tools/ci-install.sh b/tools/ci-install.sh
index 05155184b2321d3382835b056c219b4147c4dba9..b32bd823faa0a36293553320386407e036336440 100755 (executable)
--- a/tools/ci-install.sh
+++ b/tools/ci-install.sh
@@ -32,20 +32,13 @@ NULL=
 # Typical values: ubuntu, debian; maybe fedora in future
 : "${ci_distro:=ubuntu}"
 
-# ci_docker:
-# If non-empty, this is the name of a Docker image. ci-install.sh will
-# fetch it with "docker pull" and use it as a base for a new Docker image
-# named "ci-image" in which we will do our testing.
-: "${ci_docker:=}"
-
 # ci_host:
 # Either "native", or an Autoconf --host argument to cross-compile
 # the package
 : "${ci_host:=native}"
 
 # ci_in_docker:
-# Used internally by ci-install.sh. If yes, we are inside the Docker image
-# (ci_docker is empty in this case).
+# "yes" if we are running inside a Docker image.
 : "${ci_in_docker:=no}"
 
 # ci_local_packages:
@@ -62,7 +55,7 @@ NULL=
 # One of debug, reduced, legacy, production
 : "${ci_variant:=production}"
 
-echo "ci_distro=$ci_distro ci_docker=$ci_docker ci_in_docker=$ci_in_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_suite=$ci_suite ci_variant=$ci_variant $0"
+echo "ci_distro=$ci_distro ci_in_docker=$ci_in_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_suite=$ci_suite ci_variant=$ci_variant $0"
 
 if [ $(id -u) = 0 ]; then
     sudo=
@@ -70,15 +63,6 @@ else
     sudo=sudo
 fi
 
-if [ -n "$ci_docker" ]; then
-    sed \
-        -e "s/@ci_distro@/${ci_distro}/" \
-        -e "s/@ci_docker@/${ci_docker}/" \
-        -e "s/@ci_suite@/${ci_suite}/" \
-        < tools/ci-Dockerfile.in > Dockerfile
-    exec docker build -t ci-image .
-fi
-
 case "$ci_distro" in
     (debian|ubuntu)
         # Don't ask questions, just do it