← Back to team overview

canonical-hw-cert team mailing list archive

Re: [Merge] hwcert-jenkins-jobs:add-mir-ci-runs into hwcert-jenkins-jobs:master

 

Review: Approve

one question below, but otherwise looks fine to me.

Diff comments:

> diff --git a/jobs/mir/run-mir-track.sh b/jobs/mir/run-mir-track.sh
> index af5df68..888c260 100644
> --- a/jobs/mir/run-mir-track.sh
> +++ b/jobs/mir/run-mir-track.sh
> @@ -123,13 +122,15 @@ cat > job.yaml <<EOF
>            set -x
>            exec &> /tmp/mir-bashrc.log
>  
> -          if [ ! -f /tmp/mir-done ]; then
> +          if [ ! -f /tmp/mir-done ] && [ ! -f /tmp/mir-running ]; then
> +            touch /tmp/mir-running
>              loginctl activate
>  
>              if [ '{snap}' == 'ubuntu-frame' ]; then
>                echo "Spawning {snap}..."
>                TEST_ENV=(MIR_SERVER_WAYLAND_HOST=wayland-0)
>                {snap} &> /tmp/{snap}.log &
> +              SERVER_PID=\\\\\\\$!

Is all that escaping really needed? I didn't think it was normally *that* bad?

>                if ! timeout 10 sh -c "until [ -S \\\\\\\$XDG_RUNTIME_DIR/wayland-0 ]; do sleep 1; done"; then
>                  echo "ERROR {snap} failed to create its socket." | tee -a /tmp/{snap}.log
>                  touch /tmp/mir-done


-- 
https://code.launchpad.net/~hwcert-jenkins/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/440765
Your team hwcert-jenkins is subscribed to branch hwcert-jenkins-jobs:master.



References