fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 08:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: Use a rootfs tarball for NFS root, instead of a ramdisk (for LAVA)

Browse source 
We anyway depend already on robust network support in the DUTs, and we
can save quite some time this way.

It will also allow us to grow further as we expand coverage.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-By: Rohan Garg <rohan.garg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6114>
This commit is contained in:
Tomeu Vizoso 2020-07-28 11:42:42 +02:00
parent 8fab7d738e
commit 1541ef636b
6 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci.yml
View file

@ -322,7 +322,7 @@ arm_build:
- .fdo.container-build@debian@arm64v8
- .container
variables:
FDO_DISTRIBUTION_TAG: &arm_build "2020-07-28-libdrm"
FDO_DISTRIBUTION_TAG: &arm_build "2020-08-04-nfs-2"
.use-arm_build:
variables:
@ -355,7 +355,7 @@ arm64_test:
extends:
- .use-arm_test-base
variables:
FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-ramdisk-fix"
FDO_DISTRIBUTION_TAG: &arm64_test "2020-08-04-nfs-2"
.use-arm64_test:
variables:

1
.gitlab-ci/container/arm_build.sh
View file

@ -16,7 +16,6 @@ apt-get -y install \
bison \
ccache \
cmake \
cpio \
debootstrap \
fastboot \
flex \

5
.gitlab-ci/container/lava_build.sh
View file

@ -52,7 +52,6 @@ apt-get install -y automake \
git \
bc \
cmake \
cpio \
wget \
debootstrap \
libboost-dev \
@ -180,7 +179,7 @@ rm /lava-files/rootfs-${DEBIAN_ARCH}/create-rootfs.sh
rm /lava-files/rootfs-${DEBIAN_ARCH}/llvm-snapshot.gpg.key
du -ah /lava-files/rootfs-${DEBIAN_ARCH} | sort -h | tail -100
pushd /lava-files/rootfs-${DEBIAN_ARCH}
find -H | cpio -H newc -o | gzip -c - > /lava-files/lava-rootfs.cpio.gz
tar cvzf /lava-files/lava-rootfs.tgz .
popd
if [ ${DEBIAN_ARCH} = arm64 ]; then
@ -222,7 +221,7 @@ fi
############### Upload the files!
if [ -n "$UPLOAD_FOR_LAVA" ]; then
ci-fairy minio login $CI_JOB_JWT
FILES_TO_UPLOAD="lava-rootfs.cpio.gz \
FILES_TO_UPLOAD="lava-rootfs.tgz \
$KERNEL_IMAGE_NAME"
if [[ -n $DEVICE_TREES ]]; then

8
.gitlab-ci/lava-deqp.yml.jinja2
View file

@ -1,5 +1,7 @@
job_name: mesa-deqp-{{ deqp_version }}-{{ gpu_version }} {{ pipeline_info }}
device_type: {{ device_type }}
context:
extra_nfsroot_args: " init=/init rootwait"
timeouts:
job:
minutes: 40
@ -27,8 +29,8 @@ actions:
{% if kernel_image_type %}
{{ kernel_image_type }}
{% endif %}
ramdisk:
url: {{ base_artifacts_url }}/lava-rootfs.cpio.gz
nfsrootfs:
url: {{ base_artifacts_url }}/lava-rootfs.tgz
compression: gz
{% if dtb %}
dtb:
@ -48,7 +50,7 @@ actions:
download_command: wget -S --progress=dot:giga
unpack_command: tar -C / -xzf
{% else %}
commands: ramdisk
commands: nfs
{% endif %}
prompts:
- 'lava-shell:'

2
.gitlab-ci/lava-gitlab-ci.yml
View file

@ -1,5 +1,5 @@
variables:
DISTRIBUTION_TAG: "2020-08-04-ramdisk-fix"
DISTRIBUTION_TAG: "2020-08-03-nfs-2"
.kernel+rootfs:
stage: container-2

10
.gitlab-ci/lava-tracie.yml.jinja2
View file

@ -1,5 +1,7 @@
job_name: mesa-tracie-{{ gpu_version }} {{ pipeline_info }}
device_type: {{ device_type }}
context:
extra_nfsroot_args: " init=/init rootwait"
timeouts:
job:
minutes: 40
@ -27,8 +29,8 @@ actions:
{% if kernel_image_type %}
{{ kernel_image_type }}
{% endif %}
ramdisk:
url: {{ base_artifacts_url }}/lava-rootfs.cpio.gz
nfsrootfs:
url: {{ base_artifacts_url }}/lava-rootfs.tgz
compression: gz
{% if dtb %}
dtb:
@ -48,7 +50,7 @@ actions:
download_command: wget -S --progress=dot:giga
unpack_command: tar -C / -xzf
{% else %}
commands: ramdisk
commands: nfs
{% endif %}
prompts:
- 'lava-shell:'
@ -75,6 +77,8 @@ actions:
- echo "nameserver 8.8.8.8" > /etc/resolv.conf
- for i in 1 2 3; do sntp -sS pool.ntp.org && break || sleep 2; done
# amdgpu failed to find its firmware during boot, rebind
- echo 0000:00:01.0 > /sys/bus/pci/drivers/amdgpu/bind || true
{% if env_vars %}
- export {{ env_vars }}