diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2021-04-01 11:56:17 +0200 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-04-14 13:05:08 +0000 |
| commit | 3c15dba46d6ed64916cb0fcb6d82e82e5b254173 (patch) | |
| tree | cd205b74725dde830454a55aece85d0a578b4b81 /.gitlab-ci | |
| parent | a436b276f787822ed8a0e70056d7c9d8d7e0410a (diff) | |
ci: Update to latest ci-templates
This is possible again thanks to
https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9955 , and
this MR requires rebuilding all templates based docker images anyway,
so we can pull in the latest templates for free.
We need to exclude /dev/* when unpacking rootfs tarballs for the
arm_test image, since x86 container build jobs do not allow mknod
anymore with current templates. The baremetal test jobs have another
filesystem mounted on /dev anyway.
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/baremetal_build.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci/container/baremetal_build.sh b/.gitlab-ci/container/baremetal_build.sh index 4f22a408bcb..ccffc58bfd8 100644 --- a/.gitlab-ci/container/baremetal_build.sh +++ b/.gitlab-ci/container/baremetal_build.sh @@ -14,7 +14,7 @@ fi wget ${ARTIFACTS_URL}/lava-rootfs.tgz -O rootfs.tgz mkdir -p /rootfs-$arch -tar -C /rootfs-$arch -zxf rootfs.tgz +tar -C /rootfs-$arch '--exclude=./dev/*' -zxf rootfs.tgz rm rootfs.tgz if [[ $arch == "arm64" ]]; then |