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 e1d80ad70679df10e411410ac7ef4ef1ad76df61..aaed8ec14592fa964ce210c2b3a8fc08b9af38d7 100644 (file)
--- 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 c1d31b2d5cd37b1888b5ac358f9b675cd8a23d08..c32280710154ef0c68287ba128949d8110a0af99 100644 (file)
--- 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