canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+465424@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
> index af3b906..0978612 100755
> --- a/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
> +++ b/charms/focal/autopkgtest-cloud-worker/autopkgtest-cloud/worker/worker
> @@ -1333,7 +1333,17 @@ def request(msg):
>                      )
>                      running_test = False
>                      # we ack the message so it doesn't go back in the queue
> -                    msg.channel.basic_ack(msg.delivery_tag)
> +                    if code == -15:
> +                        logging.info(
> +                            "autopkgtest has been killed with USR1, indicating a restart, not removing message %s from queue"

This is SIGTERM, not USR1 I believe.

> +                            % body
> +                        )
> +                    else:
> +                        logging.info(
> +                            "autopkgtest has been killed intentionally - removing message %s from queue"
> +                            % body
> +                        )
> +                        msg.channel.basic_ack(msg.delivery_tag)
>                      logging.info(
>                          "Killing openstack server with uuid %s",
>                          test_uuid,


-- 
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/465424
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:worker-dont-remove-queue-item-systemctl-restart into autopkgtest-cloud:master.