ci: prepare-artifacts: Make the indent here match previously in the file
authorEric Anholt <eric@anholt.net>
Thu, 30 Jan 2020 23:20:35 +0000 (15:20 -0800)
committerEric Anholt <eric@anholt.net>
Fri, 21 Feb 2020 23:28:38 +0000 (15:28 -0800)
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3883>

.gitlab-ci/prepare-artifacts.sh

index f6a3f1beee49695ce65be95bf1e45058d7bbfd64..e0c0eb8cb8aa87c455f3e9a3c7fc2ff903a1c1d2 100755 (executable)
@@ -36,27 +36,27 @@ tar -cf artifacts/install.tar install
 
 # If the container has LAVA stuff, prepare the artifacts for LAVA jobs
 if [ -d /lava-files ]; then
-        # Copy kernel and device trees for LAVA
-        cp /lava-files/*Image artifacts/.
-        cp /lava-files/*.dtb artifacts/.
+    # Copy kernel and device trees for LAVA
+    cp /lava-files/*Image artifacts/.
+    cp /lava-files/*.dtb artifacts/.
 
-        # Pack ramdisk for LAVA
-        mkdir -p /lava-files/rootfs-${CROSS:-arm64}/mesa
-        cp -a install/* /lava-files/rootfs-${CROSS:-arm64}/mesa/.
+    # Pack ramdisk for LAVA
+    mkdir -p /lava-files/rootfs-${CROSS:-arm64}/mesa
+    cp -a install/* /lava-files/rootfs-${CROSS:-arm64}/mesa/.
 
-        cp .gitlab-ci/deqp-runner.sh /lava-files/rootfs-${CROSS:-arm64}/deqp/.
-        cp .gitlab-ci/deqp-*-fails.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
-        cp .gitlab-ci/deqp-*-skips.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
-        find /lava-files/rootfs-${CROSS:-arm64}/ -type f -printf "%s\t%i\t%p\n" | sort -n | tail -100
+    cp .gitlab-ci/deqp-runner.sh /lava-files/rootfs-${CROSS:-arm64}/deqp/.
+    cp .gitlab-ci/deqp-*-fails.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
+    cp .gitlab-ci/deqp-*-skips.txt /lava-files/rootfs-${CROSS:-arm64}/deqp/.
+    find /lava-files/rootfs-${CROSS:-arm64}/ -type f -printf "%s\t%i\t%p\n" | sort -n | tail -100
 
-        pushd /lava-files/rootfs-${CROSS:-arm64}/
-        find -H  |  cpio -H newc -o | gzip -c - > $CI_PROJECT_DIR/artifacts/lava-rootfs-${CROSS:-arm64}.cpio.gz
-        popd
+    pushd /lava-files/rootfs-${CROSS:-arm64}/
+    find -H  |  cpio -H newc -o | gzip -c - > $CI_PROJECT_DIR/artifacts/lava-rootfs-${CROSS:-arm64}.cpio.gz
+    popd
 
-        # Store job ID so the test stage can build URLs to the artifacts
-        echo $CI_JOB_ID > artifacts/build_job_id.txt
+    # Store job ID so the test stage can build URLs to the artifacts
+    echo $CI_JOB_ID > artifacts/build_job_id.txt
 
-        # Pass needed files to the test stage
-        cp $CI_PROJECT_DIR/.gitlab-ci/generate_lava.py artifacts/.
-        cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
+    # Pass needed files to the test stage
+    cp $CI_PROJECT_DIR/.gitlab-ci/generate_lava.py artifacts/.
+    cp $CI_PROJECT_DIR/.gitlab-ci/lava-deqp.yml.jinja2 artifacts/.
 fi