← Back to team overview

canonical-ubuntu-qa team mailing list archive

[Merge] ~uralt/autopkgtest-cloud:update-error-message into autopkgtest-cloud:master

 

Ural Tunaboyu has proposed merging ~uralt/autopkgtest-cloud:update-error-message into autopkgtest-cloud:master.

Requested reviews:
  Canonical's Ubuntu QA (canonical-ubuntu-qa)

For more details, see:
https://code.launchpad.net/~uralt/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/483765

The team name and the preferred contact method have both changed since the error message was written.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~uralt/autopkgtest-cloud:update-error-message into autopkgtest-cloud:master.
diff --git a/charms/focal/autopkgtest-web/webcontrol/request/app.py b/charms/focal/autopkgtest-web/webcontrol/request/app.py
index 6aae265..df27bdf 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/app.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/app.py
@@ -368,10 +368,10 @@ def all_exception_handler(error):
     return (
         HTML.format(
             (
-                "<p>A server error has occured, please contact a member of the Ubuntu QA team. "
-                + "You can contact them via the ubuntu-quality mailing list, "
-                + "or via the #ubuntu-quality IRC channel on irc.libera.chat "
-                + "(highlight 'qa-help' for more reactivity). Traceback:</p> <pre>%s</pre>"
+                "<p>A server error has occured, please contact a member of "
+                + "the Ubuntu Release Management team. You can contact them via the "
+                + "ubuntu-quality mailing list, or via Matrix in the #devel:ubuntu.com room "
+                + "(highlight 'release-help' for more reactivity). Traceback:</p> <pre>%s</pre>"
                 % "\n".join(
                     traceback.format_exception(
                         exc_type, exc_value, exc_traceback
diff --git a/charms/focal/autopkgtest-web/webcontrol/templates/browse-error.html b/charms/focal/autopkgtest-web/webcontrol/templates/browse-error.html
index 0edf974..ebb18c7 100644
--- a/charms/focal/autopkgtest-web/webcontrol/templates/browse-error.html
+++ b/charms/focal/autopkgtest-web/webcontrol/templates/browse-error.html
@@ -5,9 +5,9 @@
     <p>{{ error }}</p>
   </div>
   <p>
-    A server error has occured, please contact a member of the Ubuntu QA team. You
-    can contact them via the ubuntu-quality mailing list, or via the #ubuntu-quality
-    IRC channel on irc.libera.chat (highlight 'qa-help' for more reactivity).
+    A server error has occured, please contact a member of the Ubuntu Release Management team. You
+    can contact them via the ubuntu-quality mailing list, or via Matrix in the #devel:ubuntu.com
+    room (highlight 'release-help' for more reactivity).
   </p>
   <p>Please include the details below:</p>
   <pre class="code">