From: Eric Anholt Date: Sat, 23 May 2020 03:00:07 +0000 (-0700) Subject: ci: Rename x86_cross_arm_test to just arm_test. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=601a029e67cc62a32cf028d87653a877c18ecfbd;p=mesa.git ci: Rename x86_cross_arm_test to just arm_test. This gets us back to the behavior we used to have for freedreno: clicking play on arm_test gets you testing of the ARM platforms that aren't under arm-build (the LAVA runners). Reviewed-by: Kristian H. Kristensen Part-of: --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0633e74ed78..028054fe012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -205,17 +205,17 @@ arm_build: - arm_build # x86 image with ARM rootfses for baremetal testing. -x86_cross_arm_test: +arm_test: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_cross_arm_test "2020-05-28-cheza-2" + FDO_DISTRIBUTION_TAG: &arm_test "2020-05-28-cheza-2" -.use-x86_cross_arm_test: +.use-arm_test: variables: - TAG: *x86_cross_arm_test - image: "$CI_REGISTRY_IMAGE/debian/x86_cross_arm_test:$TAG" + TAG: *arm_test + image: "$CI_REGISTRY_IMAGE/debian/arm_test:$TAG" needs: - - x86_cross_arm_test + - arm_test # Native Windows docker builds # @@ -866,7 +866,7 @@ arm64_a630_gmem: arm64_a306_gles2: extends: - .baremetal-test - - .use-x86_cross_arm_test + - .use-arm_test - .freedreno-rules variables: BM_KERNEL: /lava-files/Image.gz @@ -885,7 +885,7 @@ arm64_a306_gles2: script: - .gitlab-ci/bare-metal/fastboot.sh needs: - - x86_cross_arm_test + - arm_test - arm_build - meson-arm64 tags: diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh new file mode 100644 index 00000000000..5b50a89a12b --- /dev/null +++ b/.gitlab-ci/container/arm_test.sh @@ -0,0 +1,97 @@ +#!/bin/bash + +set -e +set -o xtrace + +# etnaviv will eventually need armhf too. +CROSS_ARCHITECTURES="arm64" + +for arch in $CROSS_ARCHITECTURES; do + dpkg --add-architecture $arch +done + +############### Install packages for building +apt-get install -y ca-certificates +sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list +echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list +apt-get update + +apt-get install -y --no-remove \ + abootimg \ + android-sdk-ext4-utils \ + bc \ + bison \ + bzip2 \ + ccache \ + cmake \ + cpio \ + g++ \ + debootstrap \ + fastboot \ + flex \ + git \ + meson \ + netcat \ + python3-distutils \ + python3-minimal \ + python3-serial \ + python3.7 \ + pkg-config \ + procps \ + u-boot-tools \ + unzip + +# Cross-build test deps +for arch in $CROSS_ARCHITECTURES; do + apt-get install -y --no-remove \ + crossbuild-essential-${arch} \ + libdrm-dev:${arch} \ + libegl1-mesa-dev:${arch} \ + libelf-dev:${arch} \ + libexpat1-dev:${arch} \ + libffi-dev:${arch} \ + libgbm-dev:${arch} \ + libgles2-mesa-dev:${arch} \ + libpng-dev:${arch} \ + libstdc++6:${arch} \ + libtinfo-dev:${arch} \ + libegl1-mesa-dev:${arch} \ + libvulkan-dev:${arch} + + mkdir /var/cache/apt/archives/${arch} +done + +. .gitlab-ci/container/container_pre_build.sh + +############### Create rootfs + +for arch in $CROSS_ARCHITECTURES; do + . .gitlab-ci/create-cross-file.sh $arch + + DEBIAN_ARCH=$arch . .gitlab-ci/container/lava_arm.sh +done + +############### Uninstall the build software + +ccache --show-stats + +apt-get purge -y \ + bc \ + bison \ + bzip2 \ + ccache \ + cmake \ + g++ \ + flex \ + git \ + meson \ + pkg-config \ + python3-distutils \ + procps \ + u-boot-tools + +for arch in $CROSS_ARCHITECTURES; do + apt-get purge -y ".*:${arch}" +done + +apt-get autoremove -y --purge diff --git a/.gitlab-ci/container/x86_cross_arm_test.sh b/.gitlab-ci/container/x86_cross_arm_test.sh deleted file mode 100644 index 5b50a89a12b..00000000000 --- a/.gitlab-ci/container/x86_cross_arm_test.sh +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/bash - -set -e -set -o xtrace - -# etnaviv will eventually need armhf too. -CROSS_ARCHITECTURES="arm64" - -for arch in $CROSS_ARCHITECTURES; do - dpkg --add-architecture $arch -done - -############### Install packages for building -apt-get install -y ca-certificates -sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list -echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list -apt-get update - -apt-get install -y --no-remove \ - abootimg \ - android-sdk-ext4-utils \ - bc \ - bison \ - bzip2 \ - ccache \ - cmake \ - cpio \ - g++ \ - debootstrap \ - fastboot \ - flex \ - git \ - meson \ - netcat \ - python3-distutils \ - python3-minimal \ - python3-serial \ - python3.7 \ - pkg-config \ - procps \ - u-boot-tools \ - unzip - -# Cross-build test deps -for arch in $CROSS_ARCHITECTURES; do - apt-get install -y --no-remove \ - crossbuild-essential-${arch} \ - libdrm-dev:${arch} \ - libegl1-mesa-dev:${arch} \ - libelf-dev:${arch} \ - libexpat1-dev:${arch} \ - libffi-dev:${arch} \ - libgbm-dev:${arch} \ - libgles2-mesa-dev:${arch} \ - libpng-dev:${arch} \ - libstdc++6:${arch} \ - libtinfo-dev:${arch} \ - libegl1-mesa-dev:${arch} \ - libvulkan-dev:${arch} - - mkdir /var/cache/apt/archives/${arch} -done - -. .gitlab-ci/container/container_pre_build.sh - -############### Create rootfs - -for arch in $CROSS_ARCHITECTURES; do - . .gitlab-ci/create-cross-file.sh $arch - - DEBIAN_ARCH=$arch . .gitlab-ci/container/lava_arm.sh -done - -############### Uninstall the build software - -ccache --show-stats - -apt-get purge -y \ - bc \ - bison \ - bzip2 \ - ccache \ - cmake \ - g++ \ - flex \ - git \ - meson \ - pkg-config \ - python3-distutils \ - procps \ - u-boot-tools - -for arch in $CROSS_ARCHITECTURES; do - apt-get purge -y ".*:${arch}" -done - -apt-get autoremove -y --purge