Re: [PATCH 2/2] gitlab: show configure/make args before running

[Daniel P . Berrangé]

On Fri, Nov 04, 2022 at 08:31:31AM +1100, Richard Henderson wrote:
> On 11/4/22 06:06, Stefan Hajnoczi wrote:
> > On Thu, 3 Nov 2022 at 13:30, Daniel P. Berrangé <berrange@redhat.com> wrote:
> > > 
> > > When debugging failed jobs it is helpful to see the
> > > full configure/make args used, without having to search
> > > the gitlab config file to figure it out.
> > > 
> > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> > > ---
> > >   .gitlab-ci.d/buildtest-template.yml  |  4 ++++
> > >   .gitlab-ci.d/crossbuild-template.yml | 15 +++++++++++++++
> > >   2 files changed, 19 insertions(+)
> > 
> > On IRC Mark suggested sh -xc "$CMD" to avoid duplication. I'm not sure
> > how to get escaping right though.
> 
> set -x && ../configure ... ?

I tried adding 'set -x' to the script: blocks too. It turns out that
gitlab has an  echo '$CMD' for each line in the yaml script: section

IOW, with my patch here we get a log that looks like

$ mkdir build
$ cd build
$ if test -n "$TARGETS"; then echo "../configure --enable-werror --disable-docs 
${LD_JOBS:+--meson=git} $CONFIGURE_ARGS --target-list=\"$TARGETS\"" ; 
../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} 
$CONFIGURE_ARGS --target-list="$TARGETS" ; else echo "../configure 
--enable-werror --disable-docs ${LD_JOBS:+--meson=git} $CONFIGURE_ARGS" ; 
../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} 
$CONFIGURE_ARGS ; fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
../configure --enable-werror --disable-docs  --disable-gcrypt --enable-nettle 
--enable-docs --enable-fdt=system --enable-slirp --enable-capstone 
--target-list="tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu 
m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu"


and with adding 'set -x' we get


++ echo '$ mkdir build'
$ mkdir build
++ mkdir build
++ echo '$ cd build'
$ cd build
++ cd build
++ echo '$ if test -n "$TARGETS"; then ../configure --enable-werror 
--disable-docs ${LD_JOBS:+--meson=git} $CONFIGURE_ARGS --target-list="$TARGETS" 
; else ../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} 
$CONFIGURE_ARGS ; fi || { cat config.log meson-logs/meson-log.txt && exit 1; }'
$ if test -n "$TARGETS"; then ../configure --enable-werror --disable-docs 
${LD_JOBS:+--meson=git} $CONFIGURE_ARGS --target-list="$TARGETS" ; else 
../configure --enable-werror --disable-docs ${LD_JOBS:+--meson=git} 
$CONFIGURE_ARGS ; fi || { cat config.log meson-logs/meson-log.txt && exit 1; }
++ test -n 'tricore-softmmu microblaze-softmmu mips-softmmu xtensa-softmmu 
m68k-softmmu riscv32-softmmu ppc-softmmu sparc64-softmmu'
++ ../configure --enable-werror --disable-docs --disable-gcrypt --enable-nettle 
--enable-docs --enable-fdt=system --enable-slirp --enable-capstone 
'--target-list=tricore-softmmu microblaze-softmmu mips-softmmu xtensa-sof


Doing 'set -x && configure' only marginally helps, as the 'set -x' still
takes effect for all commands that come after configure too.


The other option is to not do either 'echo' not 'set -x', and instead
do this:

  printenv | grep -v -E "(CI_|GITLAB)"

so that the build logs has a dump of any env vars set. So when seeing

./configure $CONFIGURE_ARGS

we have a record of what $CONFIGURE_ARGS was set to.

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 :|