From 208e98beb2d550529d39b098ebd6a692d6ce822d Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Mon, 28 Jun 2021 22:15:12 +0200 Subject: [PATCH] support/misc/gitlab-ci.yml.in: templatise the make command In a followup commit, the make command used to log and display the last lines on error will be used in another job. Factorize it by introducing .run_make template. Signed-off-by: Romain Naour Cc: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Yann E. MORIN Reviewed-by: Thomas Petazzoni Signed-off-by: Arnout Vandecappelle (Essensium/Mind) --- support/misc/gitlab-ci.yml.in | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/support/misc/gitlab-ci.yml.in b/support/misc/gitlab-ci.yml.in index fcfff5c6aa..1ee3772154 100644 --- a/support/misc/gitlab-ci.yml.in +++ b/support/misc/gitlab-ci.yml.in @@ -26,20 +26,24 @@ paths: - .config +.run_make: &run_make + | + make O=${OUTPUT_DIR} > >(tee build.log |grep '>>>') 2>&1 || { + echo 'Failed build last output' + tail -200 build.log + exit 1 + } + .defconfig_base: before_script: - DEFCONFIG_NAME=${CI_JOB_NAME} + - OUTPUT_DIR=output script: - echo "Configure Buildroot for ${DEFCONFIG_NAME}" - make ${DEFCONFIG_NAME} - ./support/scripts/check-dotconfig.py .config ./configs/${DEFCONFIG_NAME} - echo 'Build buildroot' - - | - make > >(tee build.log |grep '>>>') 2>&1 || { - echo 'Failed build last output' - tail -200 build.log - exit 1 - } + - *run_make - | ./support/scripts/boot-qemu-image.py "${DEFCONFIG_NAME}" > >(tee runtime-test.log) 2>&1 || { echo 'Failed runtime test last output' -- 2.30.2