diff options
author | Pali Rohár <pali@kernel.org> | 2023-02-17 15:46:52 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2023-02-17 15:56:24 -0500 |
commit | 600bd7ecf833078fd81ababe55a2031f8b5b3441 (patch) | |
tree | 9a7b2e3af8d13843619eea2e0f4645aa0d4b55a4 | |
parent | da6618fba7aba831281724472f340a45e593ccf9 (diff) | |
download | u-boot-WIP/prebuilt-n900-parts.zip u-boot-WIP/prebuilt-n900-parts.tar.gz u-boot-WIP/prebuilt-n900-parts.tar.bz2 |
CI: Update test/nokia_rx51_test.sh to use prebuilt imagesWIP/prebuilt-n900-parts
Now that the Dockerfile creates images which have the binaries we
require included, have CI make symlinks for them and update the existing
script to support this.
Signed-off-by: Tom Rini <trini@konsulko.com>
---
Pali, since you posted this in a thread as untested, can you please
reply with a S-o-b tag? Thanks.
-rw-r--r-- | .azure-pipelines.yml | 8 | ||||
-rw-r--r-- | .gitlab-ci.yml | 10 | ||||
-rwxr-xr-x | test/nokia_rx51_test.sh | 24 |
3 files changed, 31 insertions, 11 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 8327edf..9e989df 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: windows-2019 ubuntu_vm: ubuntu-22.04 macos_vm: macOS-12 - ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230126-10Feb2023 + ci_runner_image: trini/u-boot-gitlab-ci-runner:jammy-20230126-17Feb2023 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. @@ -187,6 +187,12 @@ stages: options: $(container_option) steps: - script: | + ln -s /opt/nokia/u-boot-gen-combined . + ln -s /opt/nokia/qemu-n900.tar.gz . + ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb . + ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb . + ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb . + ln -s /opt/nokia/qemu-system-arm . export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH test/nokia_rx51_test.sh diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c3ceca2..6fbe282 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found # in the u-boot tree at tools/docker/Dockerfile -image: trini/u-boot-gitlab-ci-runner:jammy-20230126-10Feb2023 +image: trini/u-boot-gitlab-ci-runner:jammy-20230126-17Feb2023 # We run some tests in different order, to catch some failures quicker. stages: @@ -213,7 +213,13 @@ Run binman, buildman, dtoc, Kconfig and patman testsuites: Run tests for Nokia RX-51 (aka N900): stage: testsuites script: - - export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; + - ln -s /opt/nokia/u-boot-gen-combined .; + ln -s /opt/nokia/qemu-n900.tar.gz .; + ln -s /opt/nokia/kernel_2.6.28-20103103+0m5_armel.deb .; + ln -s /opt/nokia/libc6_2.5.1-1eglibc27+0m5_armel.deb .; + ln -s /opt/nokia/busybox_1.10.2.legal-1osso30+0m5_armel.deb .; + ln -s /opt/nokia/qemu-system-arm .; + export PATH=/opt/gcc-12.2.0-nolibc/arm-linux-gnueabi/bin:$PATH; test/nokia_rx51_test.sh # Check for any pylint regressions diff --git a/test/nokia_rx51_test.sh b/test/nokia_rx51_test.sh index a516ec2..dca9ef3 100755 --- a/test/nokia_rx51_test.sh +++ b/test/nokia_rx51_test.sh @@ -83,8 +83,10 @@ echo # Download qflasher and nolo images # This is proprietary qemu flasher tool with first stage images, but license allows non-commercial redistribution -wget -c http://repository.maemo.org/qemu-n900/qemu-n900.tar.gz -tar -xf qemu-n900.tar.gz +if ! test -f qflasher || ! test -f xloader-qemu.bin || ! test -f secondary-qemu.bin; then + test -f qemu-n900.tar.gz || wget -c http://repository.maemo.org/qemu-n900/qemu-n900.tar.gz + tar -xf qemu-n900.tar.gz +fi # Download Maemo script u-boot-gen-combined if ! test -f u-boot-gen-combined; then @@ -94,16 +96,22 @@ if ! test -f u-boot-gen-combined; then fi # Download Maemo fiasco kernel -wget -c http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20103103+0m5_armel.deb -dpkg -x kernel_2.6.28-20103103+0m5_armel.deb kernel_2.6.28 +if ! test -d kernel_2.6.28; then + test -f kernel_2.6.28-20103103+0m5_armel.deb || wget -c http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20103103+0m5_armel.deb + dpkg -x kernel_2.6.28-20103103+0m5_armel.deb kernel_2.6.28 +fi # Download Maemo libc -wget -c http://repository.maemo.org/pool/maemo5.0/free/g/glibc/libc6_2.5.1-1eglibc27+0m5_armel.deb -dpkg -x libc6_2.5.1-1eglibc27+0m5_armel.deb libc6_2.5.1 +if ! test -d libc6_2.5.1; then + test -f libc6_2.5.1-1eglibc27+0m5_armel.deb || wget -c http://repository.maemo.org/pool/maemo5.0/free/g/glibc/libc6_2.5.1-1eglibc27+0m5_armel.deb + dpkg -x libc6_2.5.1-1eglibc27+0m5_armel.deb libc6_2.5.1 +fi # Download Maemo busybox -wget -c http://repository.maemo.org/pool/maemo5.0/free/b/busybox/busybox_1.10.2.legal-1osso30+0m5_armel.deb -dpkg -x busybox_1.10.2.legal-1osso30+0m5_armel.deb busybox_1.10.2 +if ! test -d busybox_1.10.2; then + test -f busybox_1.10.2.legal-1osso30+0m5_armel.deb || wget -c http://repository.maemo.org/pool/maemo5.0/free/b/busybox/busybox_1.10.2.legal-1osso30+0m5_armel.deb + dpkg -x busybox_1.10.2.legal-1osso30+0m5_armel.deb busybox_1.10.2 +fi echo echo "=======================================" |