diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index c2f8bc818dc..e5c21a5607b 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -373,12 +373,14 @@ if [ "$DEBIAN_ARCH" = "amd64" ]; then fi ############### Fill rootfs +cp .gitlab-ci/setup-test-env.sh $ROOTFS/. cp .gitlab-ci/container/setup-rootfs.sh $ROOTFS/. cp .gitlab-ci/container/strip-rootfs.sh $ROOTFS/. cp .gitlab-ci/container/debian/llvm-snapshot.gpg.key $ROOTFS/. cp .gitlab-ci/container/debian/winehq.gpg.key $ROOTFS/. chroot $ROOTFS bash /setup-rootfs.sh rm $ROOTFS/{llvm-snapshot,winehq}.gpg.key +rm "$ROOTFS/setup-test-env.sh" rm "$ROOTFS/setup-rootfs.sh" rm "$ROOTFS/strip-rootfs.sh" cp /etc/wgetrc $ROOTFS/etc/. diff --git a/.gitlab-ci/container/setup-rootfs.sh b/.gitlab-ci/container/setup-rootfs.sh index 596f50c467b..9dedee05f76 100644 --- a/.gitlab-ci/container/setup-rootfs.sh +++ b/.gitlab-ci/container/setup-rootfs.sh @@ -5,6 +5,8 @@ # KERNEL_ROOTFS_TAG set -ex +. setup-test-env.sh + export DEBIAN_FRONTEND=noninteractive # Needed for ci-fairy, this revision is able to upload files to