On Mon, Sep 18, 2023 at 12:22:46PM +0200, Erik Skultety wrote:
> Unfortunately, once we go down the line of running our own scripts as
> part of GitLab CI jobs rather than open coding Shell in YAML, we lose
> the benefit of seeing each line the script executes. The downside of
> the default YAML however is that we have to maintain the same piece of
> code on 2 places in that case. Let's adopt what we use with other
> container jobs and prefix each shell command with 'run_cmd' which will
> dump it in the logs before executing.
> Flow control expressions and structures are a problem though in this
> regard, so let's just print some important values for debugging
> purposes.
>
> Signed-off-by: Erik Skultety <eskultet@xxxxxxxxxx>
> ---
> ci/jobs.sh | 26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/ci/jobs.sh b/ci/jobs.sh
> index 3a89cb1a69..27add3d105 100644
> --- a/ci/jobs.sh
> +++ b/ci/jobs.sh
> @@ -82,16 +82,16 @@ run_website_build() {
> }
>
> run_integration() {
> - sudo pip3 install --prefix=/usr avocado-framework
> + run_cmd sudo pip3 install --prefix=/usr avocado-framework
>
> # Explicitly allow storing cores globally
> - sudo sh -c "echo DefaultLimitCORE=infinity >> /etc/systemd/system.conf"
> + run_cmd sudo sh -c "echo DefaultLimitCORE=infinity >> /etc/systemd/system.conf" # Explicitly allow storing cores globally
>
> # Need to reexec systemd after changing config
> - sudo systemctl daemon-reexec
> + run_cmd sudo systemctl daemon-reexec # need to reexec systemd after changing config
Accidentally re-adding the comments at the end of line that you
removed in an earlier patch.
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 :|
