canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+461654@xxxxxxxxxxxxxxxxxx>]

Diff comments:

> diff --git a/charms/focal/autopkgtest-web/reactive/autopkgtest_web.py b/charms/focal/autopkgtest-web/reactive/autopkgtest_web.py
> index 994a91a..8d3897e 100644
> --- a/charms/focal/autopkgtest-web/reactive/autopkgtest_web.py
> +++ b/charms/focal/autopkgtest-web/reactive/autopkgtest_web.py
> @@ -256,6 +257,7 @@ def set_up_web_config(apache):
>  
>                  # webcontrol CGI scripts
>                  ScriptAlias /request.cgi {webcontrol_dir}/request.cgi/
> +                ScriptAlias /test-manager.cgi {webcontrol_dir}/test-manager.cgi/

done

>                  ScriptAlias /login {webcontrol_dir}/request.cgi/login
>                  ScriptAlias /logout {webcontrol_dir}/request.cgi/logout
>                  ScriptAlias /private-results {webcontrol_dir}/private-results.cgi/
> diff --git a/charms/focal/autopkgtest-web/webcontrol/browse.cgi b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
> index 309fb82..eab81ea 100755
> --- a/charms/focal/autopkgtest-web/webcontrol/browse.cgi
> +++ b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
> @@ -85,6 +84,7 @@ def get_running_jobs():
>  
>  def render(template, code=200, **kwargs):
>      # sort the values passed in, so that releases are in the right order
> +    flask.config["KILL-TEST-RESPONSE"] = ""

done

>      try:
>          release_arches = OrderedDict()
>          for k in sorted(
> @@ -326,6 +369,7 @@ def package_overview(package, _=None):
>                  }
>              }
>          }
> +    show_stop = flask.session.get("nickname", "") in get_admin_nicks()

and also put it into the render function so it doesn't need to be called in each endpoint - and also rename to is_admin so it can be used for other stuff

>  
>      return render(
>          "browse-package.html",


-- 
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/461654
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:stop-tests-from-webpage into autopkgtest-cloud:master.