diff options
| author | Daniel Stone <daniels@collabora.com> | 2021-06-22 00:16:05 +0100 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2021-08-03 11:13:23 +0000 |
| commit | 20bb260f7dc5614886c1f8cdf01f39e6674912e3 (patch) | |
| tree | 736627402d9fd7cb3c512e9124dd869bcc7f2f77 /.gitlab-ci.yml | |
| parent | 2de949f72316cbbbaae5d83bc7bdd248fea2d73a (diff) | |
| download | weston-20bb260f7dc5614886c1f8cdf01f39e6674912e3.tar.gz | |
CI: Parameterise kernel build a bit more
AArch64 needs different names and paths to x86-64, so let's allow for
that.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dd2fe346..541564b6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,7 +73,7 @@ stages: variables: BUILD_OS: debian FDO_DISTRIBUTION_VERSION: buster - FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/debian-install.sh' + FDO_DISTRIBUTION_EXEC: 'env FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} BUILD_ARCH=${BUILD_ARCH} KERNEL_IMAGE=${KERNEL_IMAGE} KERNEL_DEFCONFIG=${KERNEL_DEFCONFIG} bash .gitlab-ci/debian-install.sh' .ci-rules: rules: @@ -101,6 +101,8 @@ check-commit: - .os-debian variables: BUILD_ARCH: "x86-64" + KERNEL_IMAGE: "bzImage" + KERNEL_DEFCONFIG: "x86_64_defconfig" # Build our base container image, which contains the core distribution, the # toolchain, and all our build dependencies. This will be reused in the build @@ -139,11 +141,11 @@ x86_64-debian-container_prep: - meson --prefix="$PREFIX" -Db_sanitize=address ${MESON_OPTIONS} .. - ninja -k0 -j${FDO_CI_CONCURRENT:-4} - ninja install - - virtme-run --rw --pwd --kimg /weston-virtme/bzImage --kopt quiet --script-dir ../.gitlab-ci/virtme-scripts --qemu-opts -m 4096 -smp ${FDO_CI_CONCURRENT:-4} + - virtme-run --rw --pwd --kimg /weston-virtme/${KERNEL_IMAGE} --kopt quiet --script-dir ../.gitlab-ci/virtme-scripts --qemu-opts -m 4096 -smp ${FDO_CI_CONCURRENT:-4} - TEST_RES=$(cat $TESTS_RES_PATH) - rm $TESTS_RES_PATH - cp -R /weston-virtme ./ - - rm weston-virtme/bzImage + - rm weston-virtme/${KERNEL_IMAGE} - exit $TEST_RES artifacts: name: weston-$CI_COMMIT_SHA |