Mesa (master): gitlab-ci: reuse container_post_build when building the test images

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Wed Aug 19 09:10:25 UTC 2020


Module: Mesa
Branch: master
Commit: 40ab6d77c06fe5c0882fe3320583a6a2b1355eab
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=40ab6d77c06fe5c0882fe3320583a6a2b1355eab

Author: Andres Gomez <agomez at igalia.com>
Date:   Mon Aug 17 12:49:52 2020 +0300

gitlab-ci: reuse container_post_build when building the test images

Signed-off-by: Andres Gomez <agomez at igalia.com>
Reviewed-by: Daniel Stone <daniels at collabora.com>
Reviewed-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6343>

---

 .gitlab-ci/container/x86_test-gl.sh | 4 +---
 .gitlab-ci/container/x86_test-vk.sh | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

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



More information about the mesa-commit mailing list