ci: add arm_test-base docker image

Similar to x86_build-base.

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5381>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f8c6c9ff32d17a7fb79ae9ed13927d5cfb0efe31..5a57ddfe80a38ae9d0e1c90eb171efee5bd879e1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -268,11 +268,31 @@ arm_build:
   needs:
     - arm_build
 
+# Debian 10 based x86 baremetal image base
+arm_test-base:
+  extends:
+    - .fdo.container-build@debian
+    - .container
+  variables:
+    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-06-07"
+
+.use-arm_test-base:
+  extends:
+    - arm_test-base
+    - .ci-run-policy
+  stage: container-2
+  variables:
+    BASE_TAG: *arm_test-base
+    FDO_BASE_IMAGE: "$CI_REGISTRY_IMAGE/debian/arm_test-base:$BASE_TAG"
+  needs:
+    - arm_test-base
+
 # x86 image with ARM rootfses for baremetal testing.
 arm_test:
-  extends: x86_build-base
+  extends:
+    - .use-arm_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test "2020-06-01"
+    FDO_DISTRIBUTION_TAG: &arm_test "2020-06-07"
 
 .use-arm_test:
   variables:

diff --git a/.gitlab-ci/container/arm_test-base.sh b/.gitlab-ci/container/arm_test-base.sh
new file mode 100644 (file)
index 0000000..b59f6da
--- /dev/null
+++ b/.gitlab-ci/container/arm_test-base.sh
@@ -0,0 +1,72 @@
+#!/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 \
+        netcat \
+        python3-distutils \
+        python3-minimal \
+        python3-serial \
+        python3.7 \
+        pkg-config \
+        procps \
+        u-boot-tools \
+        unzip
+
+apt install -t buster-backports -y --no-remove \
+    meson
+
+# 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
+
+############### Create cross-files
+
+for arch in $CROSS_ARCHITECTURES; do
+  . .gitlab-ci/create-cross-file.sh $arch
+done
+
+. .gitlab-ci/container/container_post_build.sh

diff --git a/.gitlab-ci/container/arm_test.sh b/.gitlab-ci/container/arm_test.sh
index bebdd2350b0432dc640248de341f381b00ccecce..3bdcd2e6b0a8ab0e478ef17cb843bd2c810f3101 100644 (file)
--- a/.gitlab-ci/container/arm_test.sh
+++ b/.gitlab-ci/container/arm_test.sh
@@ -6,70 +6,11 @@ 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 \
-        netcat \
-        python3-distutils \
-        python3-minimal \
-        python3-serial \
-        python3.7 \
-        pkg-config \
-        procps \
-        u-boot-tools \
-        unzip
-
-apt install -t buster-backports -y --no-remove \
-    meson
-
-# 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
 

diff --git a/.gitlab-ci/container/arm_test_base.sh b/.gitlab-ci/container/arm_test_base.sh
new file mode 100644 (file)
index 0000000..49b71ce
--- /dev/null
+++ b/.gitlab-ci/container/arm_test_base.sh
@@ -0,0 +1,95 @@
+#!/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 \
+        netcat \
+        python3-distutils \
+        python3-minimal \
+        python3-serial \
+        python3.7 \
+        pkg-config \
+        procps \
+        u-boot-tools \
+        unzip
+
+apt install -t buster-backports -y --no-remove \
+    meson
+
+# 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
+
+############### Create cross-files
+
+for arch in $CROSS_ARCHITECTURES; do
+  . .gitlab-ci/create-cross-file.sh $arch
+done
+
+############### Uninstall the build software
+
+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
+
+. .gitlab-ci/container/container_post_build.sh