gitlab-ci: reorder container_post_build call for arm64_test image

And remove a redundant call to ccache --show-stats

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f37b11dc326dbce9e79b9a532d7c50e1975f32f5..38c699622186355c30072a0021c0e791488378ca 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,7 +355,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-nfs-2"
+    FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-18"
 
 .use-arm64_test:
   variables:

diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh
index fedb7b61c314fc9c78c1b2c99a466217a399d24d..a2d3a1ea88ef7bea0fbfd891fcfc082a8ae23aae 100644 (file)
--- a/.gitlab-ci/container/baremetal_build.sh
+++ b/.gitlab-ci/container/baremetal_build.sh
@@ -53,8 +53,8 @@ KERNEL_URL=https://gitlab.freedesktop.org/drm/msm/-/archive/drm-msm-fixes-2020-0
 
 DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_build.sh
 
-ccache --show-stats
-
-. .gitlab-ci/container/container_post_build.sh
+############### Uninstall the build software
 
 apt-get purge -y $BAREMETAL_EPHEMERAL
+
+. .gitlab-ci/container/container_post_build.sh