From: Andres Gomez <agomez@igalia.com>
Date: Wed, 19 Aug 2020 14:18:43 +0000 (+0300)
Subject: Revert "gitlab-ci: reuse container_post_build when building the test images"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1e69570331183987dd4d490fd12acdf94982953;p=mesa.git

Revert "gitlab-ci: reuse container_post_build when building the test images"

ccache is installed as ephemeral. Hence, the build will fail if used
by the post_build script after removing it.

This reverts commit 40ab6d77c06fe5c0882fe3320583a6a2b1355eab.

Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6391>
---

diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh
index e1d80ad7067..aaed8ec1459 100644
--- a/.gitlab-ci/container/x86_test-gl.sh
+++ b/.gitlab-ci/container/x86_test-gl.sh
@@ -69,7 +69,9 @@ apt-get install -y --no-remove \
 
 ############### Uninstall the build software
 
+ccache --show-stats
+
 apt-get purge -y \
       $STABLE_EPHEMERAL
 
-. .gitlab-ci/container/container_post_build.sh
+apt-get autoremove -y --purge
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index c1d31b2d5cd..c3228071015 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -129,7 +129,9 @@ wine \
 
 ############### Uninstall the build software
 
+ccache --show-stats
+
 apt-get purge -y \
       $STABLE_EPHEMERAL
 
-. .gitlab-ci/container/container_post_build.sh
+apt-get autoremove -y --purge