[libvirt PATCH] ci: jobs.sh: Add back '--no-suite syntax-check --print-errorlogs'

Erik Skultety posted 1 patch 10 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/libvirt tags/patchew/96fe1625c4dad1264548b037a4a6b3c47b1a4943.1694606102.git.eskultet@redhat.com
ci/jobs.sh | 3 +++
1 file changed, 3 insertions(+)
[libvirt PATCH] ci: jobs.sh: Add back '--no-suite syntax-check --print-errorlogs'
Posted by Erik Skultety 10 months ago
Commit f688a53a converted .gitlab-ci.yml to the usage of ci/jobs.sh
functions, but in doing that our test options
    '--no-suite syntax-check --print-errorlogs'
got lost in the process and since commit 8e660c52 didn't introduce them
in the first place, it caused a behavioral regression. This patch adds
them back.

Fixes: 8e660c5286d7e2d07dd61681074bf1555955552d

Signed-off-by: Erik Skultety <eskultet@redhat.com>
---

Technically this is a build breaker fix, but sending for review anyway to see
if there's an agreement on this approach.

 ci/jobs.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/jobs.sh b/ci/jobs.sh
index abd695e231..eb4a4e29cf 100644
--- a/ci/jobs.sh
+++ b/ci/jobs.sh
@@ -39,7 +39,10 @@ run_dist() {
 }
 
 run_test() {
+    TEST_ARGS="${TEST_ARGS:=--no-suite syntax-check --print-errorlogs}"
+
     test -f $GIT_ROOT/build/build.ninja || run_meson_setup
+
     run_cmd meson test -C build $TEST_ARGS
 }
 
-- 
2.41.0
Re: [libvirt PATCH] ci: jobs.sh: Add back '--no-suite syntax-check --print-errorlogs'
Posted by Daniel P. Berrangé 10 months ago
On Wed, Sep 13, 2023 at 01:55:54PM +0200, Erik Skultety wrote:
> Commit f688a53a converted .gitlab-ci.yml to the usage of ci/jobs.sh
> functions, but in doing that our test options
>     '--no-suite syntax-check --print-errorlogs'
> got lost in the process and since commit 8e660c52 didn't introduce them
> in the first place, it caused a behavioral regression. This patch adds
> them back.
> 
> Fixes: 8e660c5286d7e2d07dd61681074bf1555955552d
> 
> Signed-off-by: Erik Skultety <eskultet@redhat.com>
> ---
> 
> Technically this is a build breaker fix, but sending for review anyway to see
> if there's an agreement on this approach.

These defaults for run_test() are consistent with the override
done in run_codestyle(), so:

Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>


> 
>  ci/jobs.sh | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/ci/jobs.sh b/ci/jobs.sh
> index abd695e231..eb4a4e29cf 100644
> --- a/ci/jobs.sh
> +++ b/ci/jobs.sh
> @@ -39,7 +39,10 @@ run_dist() {
>  }
>  
>  run_test() {
> +    TEST_ARGS="${TEST_ARGS:=--no-suite syntax-check --print-errorlogs}"
> +
>      test -f $GIT_ROOT/build/build.ninja || run_meson_setup
> +
>      run_cmd meson test -C build $TEST_ARGS
>  }

With regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|