| Message ID | 2dc3c5c61d8476256770c8f4b38bf687caa7ff59.1624802988.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | gitlab-ci: allow running test-pkg (branch yem/test-pkg-in-gitlab-ci) | expand |
Le 27/06/2021 à 16:09, Yann E. MORIN a écrit : > From: Romain Naour <romain.naour@gmail.com> > > 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 <romain.naour@gmail.com> > Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Reviewed-by: Romain Naour <romain.naour@gmail.com> Best regards, Romain > --- > 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' >
Hello, On Sun, 27 Jun 2021 16:09:58 +0200 "Yann E. MORIN" <yann.morin.1998@free.fr> wrote: > From: Romain Naour <romain.naour@gmail.com> > > 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. The commit title.. is missing a commit title :-) Thomas
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'