X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=967abed9f250006045e847463fcf74199869354d;hb=989fd97fe56676dd636803c467834c36a86d06a5;hp=f59dc40f3e9ce21bc240497732f87c34204fb30a;hpb=c957be9ba006789c7ca1158120ed40265bfeed8a;p=oweals%2Fu-boot.git diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f59dc40f3e..967abed9f2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found at: # https://gitlab.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:xenial-20190720-29Jul2019 +image: trini/u-boot-gitlab-ci-runner:bionic-20190912.1-03Oct2019 # We run some tests in different order, to catch some failures quicker. stages: @@ -22,8 +22,9 @@ stages: - . /tmp/venv/bin/activate - pip install pytest==2.8.7 - pip install python-subunit - - grub-mkimage -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - - grub-mkimage -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd + - pip install coverage + - grub-mkimage --prefix="" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd + - grub-mkimage --prefix="" -o ~/grub_x64.efi -O x86_64-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd - mkdir ~/grub2-arm - ( cd ~/grub2-arm; wget -O - http://download.opensuse.org/ports/armv7hl/distribution/leap/42.2/repo/oss/suse/armv7hl/grub2-arm-efi-2.02~beta2-87.1.armv7hl.rpm | rpm2cpio | cpio -di ) - mkdir ~/grub2-arm64 @@ -36,9 +37,9 @@ stages: # use clang only do one configuration. - if [[ "${BUILDMAN}" != "" ]]; then ret=0; - tools/buildman/buildman -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?; + tools/buildman/buildman -o /tmp -P -E ${BUILDMAN} ${OVERRIDE}|| ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then - tools/buildman/buildman -sdeP ${BUILDMAN}; + tools/buildman/buildman -o /tmp -sdeP ${BUILDMAN}; exit $ret; fi; fi @@ -46,7 +47,7 @@ stages: # never prevent any test from running. That way, we can always pass # "-k something" even when $TEST_PY_TEST_SPEC doesnt need a custom # value. - - export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/${TEST_PY_BD}; + - export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/${TEST_PY_BD}; export PATH=/opt/qemu/bin:/tmp/uboot-test-hooks/bin:/usr/bin:/bin; export PYTHONPATH=/tmp/uboot-test-hooks/py/travis-ci; if [[ "${TEST_PY_BD}" != "" ]]; then @@ -59,18 +60,18 @@ stages: fi; fi; -build all 32bit ARM plaforms: +build all 32bit ARM platforms: tags: [ 'all' ] stage: world build script: - ret=0; - ./tools/buildman/buildman -P -E arm -x aarch64 || ret=$?; + ./tools/buildman/buildman -o /tmp -P -E arm -x aarch64 || ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then - ./tools/buildman/buildman -sdeP; + ./tools/buildman/buildman -o /tmp -sdeP; exit $ret; fi; -build all 64bit ARM plaforms: +build all 64bit ARM platforms: tags: [ 'all' ] stage: world build script: @@ -78,31 +79,31 @@ build all 64bit ARM plaforms: - . /tmp/venv/bin/activate - pip install pyelftools - ret=0; - ./tools/buildman/buildman -P -E aarch64 || ret=$?; + ./tools/buildman/buildman -o /tmp -P -E aarch64 || ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then - ./tools/buildman/buildman -sdeP; + ./tools/buildman/buildman -o /tmp -sdeP; exit $ret; fi; -build all PowerPC plaforms: +build all PowerPC platforms: tags: [ 'all' ] stage: world build script: - ret=0; - ./tools/buildman/buildman -P -E powerpc || ret=$?; + ./tools/buildman/buildman -o /tmp -P -E powerpc || ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then - ./tools/buildman/buildman -sdeP; + ./tools/buildman/buildman -o /tmp -sdeP; exit $ret; fi; -build all other plaforms: +build all other platforms: tags: [ 'all' ] stage: world build script: - ret=0; - ./tools/buildman/buildman -P -E -x arm,powerpc || ret=$?; + ./tools/buildman/buildman -o /tmp -P -E -x arm,powerpc || ret=$?; if [[ $ret -ne 0 && $ret -ne 129 ]]; then - ./tools/buildman/buildman -sdeP; + ./tools/buildman/buildman -o /tmp -sdeP; exit $ret; fi; @@ -145,34 +146,31 @@ Build tools-only: script: - make tools-only_config tools-only -j$(nproc) -# Run various tool tests -Run patman testsuite: +# Ensure env tools build +Build envtools: tags: [ 'all' ] stage: testsuites script: - - git config --global user.name "GitLab CI Runner" - - git config --global user.email trini@konsulko.com - - ./tools/patman/patman --test + - make tools-only_config envtools -j$(nproc) -Run buildman testsuite: +Run binman, buildman, dtoc and patman testsuites: tags: [ 'all' ] stage: testsuites script: - - ./tools/buildman/buildman -t - -Run binman and dtoc testsuite: - tags: [ 'all' ] - stage: testsuites - script: - - virtualenv /tmp/venv - - . /tmp/venv/bin/activate - - pip install pyelftools - - export UBOOT_TRAVIS_BUILD_DIR=`cd .. && pwd`/.bm-work/sandbox_spl; - ./tools/buildman/buildman -P sandbox_spl && - export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; - export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; - ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test && - ./tools/dtoc/dtoc -t + - git config --global user.name "GitLab CI Runner"; + git config --global user.email trini@konsulko.com; + export USER=gitlab; + virtualenv /tmp/venv; + . /tmp/venv/bin/activate; + pip install pyelftools; + export UBOOT_TRAVIS_BUILD_DIR=/tmp/.bm-work/sandbox_spl; + export PYTHONPATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc/pylibfdt"; + export PATH="${UBOOT_TRAVIS_BUILD_DIR}/scripts/dtc:${PATH}"; + ./tools/buildman/buildman -o /tmp -P sandbox_spl; + ./tools/binman/binman --toolpath ${UBOOT_TRAVIS_BUILD_DIR}/tools test; + ./tools/buildman/buildman -t; + ./tools/dtoc/dtoc -t; + ./tools/patman/patman --test # Test sandbox with test.py sandbox test.py: @@ -252,7 +250,6 @@ qemu_mips test.py: TEST_PY_BD: "qemu_mips" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mips$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn qemu_mipsel test.py: @@ -261,7 +258,6 @@ qemu_mipsel test.py: TEST_PY_BD: "qemu_mipsel" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mipsel$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn qemu_mips64 test.py: @@ -270,7 +266,6 @@ qemu_mips64 test.py: TEST_PY_BD: "qemu_mips64" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mips64$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn qemu_mips64el test.py: @@ -279,7 +274,6 @@ qemu_mips64el test.py: TEST_PY_BD: "qemu_mips64el" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu_mips64el$" - TOOLCHAIN: "mips" <<: *buildman_and_testpy_dfn qemu-ppce500 test.py: @@ -288,7 +282,14 @@ qemu-ppce500 test.py: TEST_PY_BD: "qemu-ppce500" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu-ppce500$" - TOOLCHAIN: "powerpc" + <<: *buildman_and_testpy_dfn + +qemu-riscv64 test.py: + tags: [ 'all' ] + variables: + TEST_PY_BD: "qemu-riscv64" + TEST_PY_TEST_SPEC: "not sleep" + BUILDMAN: "^qemu-riscv64$" <<: *buildman_and_testpy_dfn qemu-x86 test.py: @@ -297,7 +298,6 @@ qemu-x86 test.py: TEST_PY_BD: "qemu-x86" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu-x86$" - TOOLCHAIN: "i386" <<: *buildman_and_testpy_dfn qemu-x86_64 test.py: @@ -306,7 +306,6 @@ qemu-x86_64 test.py: TEST_PY_BD: "qemu-x86_64" TEST_PY_TEST_SPEC: "not sleep" BUILDMAN: "^qemu-x86_64$" - TOOLCHAIN: "i386" <<: *buildman_and_testpy_dfn zynq_zc702 test.py: @@ -334,5 +333,4 @@ xtfpga test.py: TEST_PY_TEST_SPEC: "not sleep" TEST_PY_ID: "--id qemu" BUILDMAN: "^xtfpga$" - TOOLCHAIN: "xtensa-dc233c-elf" <<: *buildman_and_testpy_dfn