ci/lava: add setup-test-env.sh to the rootfs
This allows strip-rootfs.sh to use sections, useful in the next commit. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32241>
This commit is contained in:
committed by
Marge Bot
parent
05b2024c36
commit
31a23d9801
@@ -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/.
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user