From 1541ef636b2cf792c57762b0fca0dc6849bd19b5 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 28 Jul 2020 11:42:42 +0200 Subject: [PATCH] ci: Use a rootfs tarball for NFS root, instead of a ramdisk (for LAVA) 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 Reviewed-By: Rohan Garg Part-of: --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/container/arm_build.sh | 1 - .gitlab-ci/container/lava_build.sh | 5 ++--- .gitlab-ci/lava-deqp.yml.jinja2 | 8 +++++--- .gitlab-ci/lava-gitlab-ci.yml | 2 +- .gitlab-ci/lava-tracie.yml.jinja2 | 10 +++++++--- 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e260420c5c7..b2ca5dcb8ee 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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: diff --git a/.gitlab-ci/container/arm_build.sh b/.gitlab-ci/container/arm_build.sh index 38270575400..29494b381d7 100644 --- a/.gitlab-ci/container/arm_build.sh +++ b/.gitlab-ci/container/arm_build.sh @@ -16,7 +16,6 @@ apt-get -y install \ bison \ ccache \ cmake \ - cpio \ debootstrap \ fastboot \ flex \ diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh index 7a7e997a31c..ed10c7883a8 100755 --- a/.gitlab-ci/container/lava_build.sh +++ b/.gitlab-ci/container/lava_build.sh @@ -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 diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2 index 5ec39337b73..d5c0a2c6cf7 100644 --- a/.gitlab-ci/lava-deqp.yml.jinja2 +++ b/.gitlab-ci/lava-deqp.yml.jinja2 @@ -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:' diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 99c1bd43553..d5a51ce41d2 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -1,5 +1,5 @@ variables: - DISTRIBUTION_TAG: "2020-08-04-ramdisk-fix" + DISTRIBUTION_TAG: "2020-08-03-nfs-2" .kernel+rootfs: stage: container-2 diff --git a/.gitlab-ci/lava-tracie.yml.jinja2 b/.gitlab-ci/lava-tracie.yml.jinja2 index d0109bc2468..660ecfd6535 100644 --- a/.gitlab-ci/lava-tracie.yml.jinja2 +++ b/.gitlab-ci/lava-tracie.yml.jinja2 @@ -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 }} -- 2.30.2