ci: Be consistent about install path
Make both LAVA and bare-metal untar into $CI_PROJECT_DIR/install/, and symlink /install/ to it during init. Signed-off-by: Daniel Stone <daniels@collabora.com> Acked-by: Martin Peres <martin.peres@mupuf.org> Acked-by: Emma Anholt <emma@anholt.net> Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11337>
This commit is contained in:
parent
b9e0aad639
commit
813c3324f0
|
@ -21,4 +21,3 @@ set -x
|
|||
# Add the Mesa drivers we built, and make a consistent symlink to them.
|
||||
mkdir -p $rootfs_dst/$CI_PROJECT_DIR
|
||||
rsync -aH --delete $CI_PROJECT_DIR/install/ $rootfs_dst/$CI_PROJECT_DIR/install/
|
||||
ln -sf $CI_PROJECT_DIR/install $rootfs_dst/install
|
||||
|
|
|
@ -21,6 +21,10 @@ for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done || true
|
|||
# Set up any devices required by the jobs
|
||||
[ -z "$HWCI_KERNEL_MODULES" ] || (echo -n $HWCI_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe)
|
||||
|
||||
# Fix prefix confusion: the build installs to $CI_PROJECT_DIR, but we expect
|
||||
# it in /install
|
||||
ln -sf $CI_PROJECT_DIR/install /install
|
||||
|
||||
# Store Mesa's disk cache under /tmp, rather than sending it out over NFS.
|
||||
export XDG_CACHE_HOME=/tmp
|
||||
|
||||
|
|
|
@ -82,11 +82,11 @@ actions:
|
|||
- echo "$NFS_SERVER_IP caching-proxy" >> /etc/hosts
|
||||
- for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done
|
||||
|
||||
- wget -S --progress=dot:giga -O- {{ mesa_build_url }} | tar -xz
|
||||
- mkdir -p $CI_PROJECT_DIR
|
||||
- wget -S --progress=dot:giga -O- {{ mesa_build_url }} | tar -xz -C $CI_PROJECT_DIR
|
||||
- wget -S --progress=dot:giga -O- {{ job_rootfs_overlay_url }} | tar -xz -C /
|
||||
- . /set-job-env-vars.sh
|
||||
- mkdir -p $CI_PROJECT_DIR
|
||||
- ln -sf /install $CI_PROJECT_DIR/install
|
||||
- ln -sf $CI_PROJECT_DIR/install /install
|
||||
|
||||
# Set up our devices
|
||||
- '[ -z "$HWCI_KERNEL_MODULES" ] || (echo -n $HWCI_KERNEL_MODULES | xargs -d, -n1 /usr/sbin/modprobe)'
|
||||
|
|
Loading…
Reference in New Issue