From acf9d8b75d9ae39c812b9b2ed41ff0078bd35c42 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 10 Jun 2020 14:17:23 -0700 Subject: [PATCH] ci/bare-metal: Don't include dev packages in arm*test. We just need these to build our rootfs, clean them out afterwards. Reviewed-by: Tomeu Vizoso Part-of: --- .gitlab-ci.yml | 2 +- .gitlab-ci/container/baremetal_build.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index edec580a39f..59ebcf4015a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -305,7 +305,7 @@ arm64_test: extends: - .use-arm_test-base variables: - FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-stable" + FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-22-ephemeral" .use-arm64_test: variables: diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index 0f697f0c75c..b84608f87e9 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -7,7 +7,7 @@ dpkg --add-architecture $arch apt-get update # Cross-build test deps -apt-get install -y --no-remove \ +BAREMETAL_EPHEMERAL=" \ crossbuild-essential-$arch \ libdrm-dev:$arch \ libegl1-mesa-dev:$arch \ @@ -21,6 +21,9 @@ apt-get install -y --no-remove \ libtinfo-dev:$arch \ libegl1-mesa-dev:$arch \ libvulkan-dev:$arch + " + +apt-get install -y --no-remove $BAREMETAL_EPHEMERAL mkdir /var/cache/apt/archives/$arch @@ -37,3 +40,5 @@ DEBIAN_ARCH=$arch INCLUDE_VK_CTS=1 . .gitlab-ci/container/lava_arm.sh ccache --show-stats . .gitlab-ci/container/container_post_build.sh + +apt-get purge -y $BAREMETAL_EPHEMERAL -- 2.30.2