From b08fcab44d7a4839f141572ac1c4e80e9180cbb5 Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Mon, 17 Aug 2020 12:53:35 +0300 Subject: [PATCH] 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 Reviewed-by: Daniel Stone Reviewed-by: Christian Gmeiner Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/baremetal_build.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f37b11dc326..38c69962218 100644 --- 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 fedb7b61c31..a2d3a1ea88e 100644 --- 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 -- 2.30.2