ci: bare-metal: drop webdav support

The NFS method is much faster.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11611>

.gitlab-ci.yml

@@ -459,7 +459,7 @@ arm_build:
   variables:
     GIT_STRATEGY: fetch
     KERNEL_URL: *kernel-rootfs-url
-    MESA_ROOTFS_TAG: &kernel-rootfs "2021-06-10-piglit"
+    MESA_ROOTFS_TAG: &kernel-rootfs "2021-06-29-drop-webdav"
     DISTRIBUTION_TAG: &distribution-tag-arm "${MESA_ROOTFS_TAG}--${MESA_ARTIFACTS_TAG}--${MESA_TEMPLATES_COMMIT}"
   script:
     - .gitlab-ci/container/lava_build.sh
@@ -514,7 +514,7 @@ arm_test:
     FDO_DISTRIBUTION_EXEC: 'env ARTIFACTS_PREFIX=https://${MINIO_HOST}/mesa-lava ARTIFACTS_SUFFIX=${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT} CI_PROJECT_PATH=${CI_PROJECT_PATH} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} FDO_UPSTREAM_REPO=${FDO_UPSTREAM_REPO} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
     FDO_DISTRIBUTION_TAG: "${MESA_IMAGE_TAG}--${MESA_ROOTFS_TAG}--${MESA_ARM_BUILD_TAG}--${MESA_TEMPLATES_COMMIT}"
     MESA_ARM_BUILD_TAG: *arm_build
-    MESA_IMAGE_TAG: &arm_test "2021-06-11-remove-unzip"
+    MESA_IMAGE_TAG: &arm_test "2021-06-29-drop-webdav"
     MESA_ROOTFS_TAG: *kernel-rootfs
 
 .use-arm_test:

.gitlab-ci/bare-metal/fastboot.sh

@@ -50,15 +50,6 @@ if echo $BM_CMDLINE | grep -q "root=/dev/nfs"; then
   BM_FASTBOOT_NFSROOT=1
 fi
 
-if [ -z "$BM_FASTBOOT_NFSROOT" ]; then
-  if [ -z "$BM_WEBDAV_IP" -o -z "$BM_WEBDAV_PORT" ]; then
-    echo "BM_WEBDAV_IP and/or BM_WEBDAV_PORT is not set - no results will be uploaded from DUT!"
-    WEBDAV_CMDLINE=""
-  else
-    WEBDAV_CMDLINE="webdav=http://$BM_WEBDAV_IP:$BM_WEBDAV_PORT"
-  fi
-fi
-
 set -ex
 
 # Clear out any previous run's artifacts.
@@ -98,14 +89,6 @@ else
     cpio -H newc -o | \
     xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
   popd
-
-  # Start nginx to get results from DUT
-  if [ -n "$WEBDAV_CMDLINE" ]; then
-    ln -s `pwd`/results /results
-    sed -i s/80/$BM_WEBDAV_PORT/g /etc/nginx/sites-enabled/default
-    sed -i s/www-data/root/g /etc/nginx/nginx.conf
-    nginx
-  fi
 fi
 
 # Make the combined kernel image and dtb for passing to fastboot.  For normal
@@ -133,7 +116,7 @@ abootimg \
   --create artifacts/fastboot.img \
   -k Image.gz-dtb \
   -r rootfs.cpio.gz \
-  -c cmdline="$BM_CMDLINE $WEBDAV_CMDLINE"
+  -c cmdline="$BM_CMDLINE"
 rm Image.gz-dtb
 
 export PATH=$BM:$PATH

.gitlab-ci/bare-metal/nginx-default-site

@@ -1,20 +0,0 @@
-server {
-    listen 80 default_server;
-    listen [::]:80 default_server;
-
-    server_name _;
-
-    location / {
-        dav_methods     PUT;
-        dav_ext_methods PROPFIND OPTIONS;
-        dav_access      user:rw group:rw all:r;
-
-        client_body_temp_path   /tmp;
-        client_max_body_size    0;
-        create_full_put_path    on;
-
-        root /results;
-
-        autoindex     on;
-    }
-}

.gitlab-ci/common/init-stage2.sh

@@ -64,11 +64,6 @@ if sh $HWCI_TEST_SCRIPT; then
 fi
 
 # upload artifacts
-WEBDAV=$(cat /proc/cmdline | tr " " "\n" | grep webdav | cut -d '=' -f 2 || true)
-if [ -n "$WEBDAV" ]; then
-  find /results -type f -exec curl -T {} $WEBDAV/{} \;
-fi
-
 MINIO=$(cat /proc/cmdline | tr ' ' '\n' | grep minio_results | cut -d '=' -f 2 || true)
 if [ -n "$MINIO" ]; then
   tar -czf results.tar.gz results/;

.gitlab-ci/container/arm_test.sh

@@ -13,7 +13,6 @@ apt-get install -y --no-remove \
         cpio \
         fastboot \
         netcat \
-        nginx-full \
         procps \
         python-is-python3 \
         python3-distutils \
@@ -23,10 +22,6 @@ apt-get install -y --no-remove \
         snmp \
         wget
 
-# setup nginx
-sed -i '/gzip_/ s/#\ //g' /etc/nginx/nginx.conf
-cp .gitlab-ci/bare-metal/nginx-default-site  /etc/nginx/sites-enabled/default
-
 # setup SNMPv2 SMI MIB
 wget https://raw.githubusercontent.com/net-snmp/net-snmp/master/mibs/SNMPv2-SMI.txt \
     -O /usr/share/snmp/mibs/SNMPv2-SMI.txt

.gitlab-ci/container/create-rootfs.sh

@@ -22,7 +22,6 @@ apt-get -y install --no-install-recommends \
     $ARCH_PACKAGES \
     $INSTALL_CI_FAIRY_PACKAGES \
     ca-certificates \
-    curl \
     firmware-realtek \
     initramfs-tools \
     libasan6 \

docs/ci/bare-metal.rst

@@ -121,11 +121,6 @@ required by your bare-metal script, something like::
 The ``FDO_CI_CONCURRENT`` variable should be set to the number of CPU threads on
 the board, which is used for auto-tuning of job parallelism.
 
-If you want to collect the results for fastboot you need to add the following
-two board-specific environment variables ``BM_WEBDAV_IP`` and ``BM_WEBDAV_PORT``.
-These represent the IP address of the Docker host and the board specific port number
-that gets used to start a nginx server.
-
 Once you've updated your runners' configs, restart with ``sudo service
 gitlab-runner restart``