From: Eric Anholt <eric@anholt.net>
Date: Tue, 2 Jun 2020 23:14:36 +0000 (-0700)
Subject: ci: Use rsync for initial nfsroot population on cheza.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3d5429d646136cdd3b8abe10f4b8d1f261472414;p=mesa.git

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>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7120dd87e03..3339cea12f8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh
index 6caff73bb93..0b978df73a3 100755
--- a/.gitlab-ci/bare-metal/cros-servo.sh
+++ b/.gitlab-ci/bare-metal/cros-servo.sh
@@ -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
 
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index f7db884c9f0..72d38b4d718 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -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
diff --git a/.gitlab-ci/bare-metal/rootfs-setup.sh b/.gitlab-ci/bare-metal/rootfs-setup.sh
index 1187971a190..0181a4e8fac 100644
--- a/.gitlab-ci/bare-metal/rootfs-setup.sh
+++ b/.gitlab-ci/bare-metal/rootfs-setup.sh
@@ -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
diff --git a/.gitlab-ci/container/arm_test-base.sh b/.gitlab-ci/container/arm_test-base.sh
index 1454d51996d..5f5be0464fe 100644
--- a/.gitlab-ci/container/arm_test-base.sh
+++ b/.gitlab-ci/container/arm_test-base.sh
@@ -30,6 +30,7 @@ apt-get install -y --no-remove \
         python3.7 \
         pkg-config \
         procps \
+        rsync \
         u-boot-tools \
         unzip