ci: Use rsync for initial nfsroot population on cheza.

rm -rf and then copying over all the contents again is a waste of time
when we'll almost always be using the same rootfs.  Saves about 30s of job
time.

Closes: #3065
Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5266>
This commit is contained in:
Eric Anholt
2020-06-02 16:14:36 -07:00
committed by Marge Bot
parent 9e11cce517
commit 3d5429d646
5 changed files with 9 additions and 8 deletions

View File

@@ -274,7 +274,7 @@ arm_test-base:
- .fdo.container-build@debian
- .container
variables:
FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-08"
FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-09-rsync"
.use-arm_test-base:
extends:
@@ -292,7 +292,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-09-cheza-vk"
FDO_DISTRIBUTION_TAG: &arm64_test "2020-06-09-rsync"
.use-arm64_test:
variables:

View File

@@ -49,7 +49,7 @@ set -ex
# Create the rootfs in the NFS directory. rm to make sure it's in a pristine
# state, since it's volume-mounted on the host.
rm -rf /nfs/*
rsync -a --delete $BM_ROOTFS/ /nfs/
mkdir -p /nfs/results
. $BM/rootfs-setup.sh /nfs

View File

@@ -47,8 +47,10 @@ fi
set -ex
# Create the rootfs in a temp dir
mkdir rootfs
# Copy the rootfs to a temporary for our setup, as I believe changes to the
# container can end up impacting future runs.
cp -Rp $BM_ROOTFS/ rootfs
. .gitlab-ci/bare-metal/rootfs-setup.sh rootfs
# Finally, pack it up into a cpio rootfs. Skip the vulkan CTS since none of

View File

@@ -2,9 +2,7 @@
rootfs_dst=$1
# Copy the rootfs to a temporary for our setup, as I believe changes to the
# container can end up impacting future runs.
cp -Rp $BM_ROOTFS/. $rootfs_dst
mkdir -p $rootfs_dst/results
# Set up the init script that brings up the system.
cp $BM/init.sh $rootfs_dst/init

View File

@@ -30,6 +30,7 @@ apt-get install -y --no-remove \
python3.7 \
pkg-config \
procps \
rsync \
u-boot-tools \
unzip