aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci/bare-metal
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2020-03-03 14:38:09 -0800
committerEric Anholt <[email protected]>2020-03-17 11:11:51 -0700
commit4bc15e78fa51e6c0df491a9fef4f99b2dfad77a9 (patch)
treed4cb4cf33ec4cff0d941697117bf02a6afa2e071 /.gitlab-ci/bare-metal
parent8997757c6abfe657a259bc5c681628e70792b67a (diff)
ci: Enable testing GLES2-3 on a530 (Dragonboard 820c).
Following on from the db410c conversion to baremetal testing, reuse the same scripts in the same rack to run 7 db820c boards (#4/8 is failing in the bootloader for unknown reasons). Reviewed-by: Kristian H. Kristensen <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4177>
Diffstat (limited to '.gitlab-ci/bare-metal')
-rwxr-xr-x.gitlab-ci/bare-metal/fastboot.sh8
-rw-r--r--.gitlab-ci/bare-metal/init.sh2
2 files changed, 6 insertions, 4 deletions
diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index bdb885bfef9..6b6174a4a9f 100755
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -22,7 +22,7 @@ if [ -z "$BM_FASTBOOT_SERIAL" ]; then
fi
if [ -z "$BM_KERNEL" ]; then
- echo "Must set BM_KERNEL to your board's kernel Image in the job's variables:"
+ echo "Must set BM_KERNEL to your board's kernel vmlinuz or Image.gz in the job's variables:"
exit 1
fi
@@ -67,14 +67,14 @@ pushd rootfs
find -H | cpio -H newc -o | xz --check=crc32 -T4 - > $CI_PROJECT_DIR/rootfs.cpio.gz
popd
-gzip -c $BM_KERNEL > Image.gz
-cat Image.gz $BM_DTB > Image.gz-dtb
+cat $BM_KERNEL $BM_DTB > Image.gz-dtb
+
abootimg \
--create artifacts/fastboot.img \
-k Image.gz-dtb \
-r rootfs.cpio.gz \
-c cmdline="$BM_CMDLINE"
-rm Image.gz Image.gz-dtb
+rm Image.gz-dtb
# Start watching serial, and power up the device.
$BM/serial-buffer.py $BM_SERIAL | tee artifacts/serial-output.txt &
diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index da5006afc91..c5e5c97effc 100644
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+set -ex
+
mount -t proc none /proc
mount -t sysfs none /sys
mount -t devtmpfs none /dev || echo possibly already mounted