canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+445979@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/autopkgtest-cloud:fix_login_issue_staging into autopkgtest-cloud:master.

Commit message:
fix: staging website not redirecting to ubuntu sso login

We've been having a problem where autopkgtest tests aren't requestable
via a url as specified in the Proposed Migration wiki page. Turns out
the issue was that the webserver was trying to access `login.ubuntu.com`
via a proxy which is not required and breaks functionality. Adding this
website to the `no_proxy` variable in the service bundle means it'll be
inherited by `/etc/apache2/conf-enabled/no_proxy.conf` and solves the
issue. The issue is currently cowboy fixed on staging.

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

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

fix: staging website not redirecting to ubuntu sso login

We've been having a problem where autopkgtest tests aren't requestable
via a url as specified in the Proposed Migration wiki page. Turns out
the issue was that the webserver was trying to access `login.ubuntu.com`
via a proxy which is not required and breaks functionality. Adding this
website to the `no_proxy` variable in the service bundle means it'll be
inherited by `/etc/apache2/conf-enabled/no_proxy.conf` and solves the
issue. The issue is currently cowboy fixed on staging.
-- 
Your team Canonical's Ubuntu QA is requested to review the proposed merge of ~andersson123/autopkgtest-cloud:fix_login_issue_staging 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 8654ec2..e7094ce 100644
--- a/charms/focal/autopkgtest-web/webcontrol/request/app.py
+++ b/charms/focal/autopkgtest-web/webcontrol/request/app.py
@@ -207,6 +207,7 @@ def index_root():
             "state": "pending",
             "context": "%s-%s" % (params["release"], params["arch"]),
             "description": "autopkgtest running",
+            # and this
             "target_url": "http://autopkgtest.ubuntu.com/running#pkg-";
             + params["package"],
         }
@@ -247,6 +248,7 @@ def index_root():
         else:
             s.send_amqp_request(**params)
         # add link to result page for Ubuntu results
+        # could be that this isn't staging?
         if not params.get("ppas"):
             url = "https://autopkgtest.ubuntu.com/packages/{}/{}/{}".format(
                 params["package"], params["release"], params["arch"]
diff --git a/lxc-slave-admin/setup-adt-lxc.commands b/lxc-slave-admin/setup-adt-lxc.commands
index 337027b..8ae3877 100644
--- a/lxc-slave-admin/setup-adt-lxc.commands
+++ b/lxc-slave-admin/setup-adt-lxc.commands
@@ -33,7 +33,7 @@ sudo apt-get install -y --no-install-recommends git python3-debian libdpkg-perl 
 # set up proxy, mostly for git pulling
 echo "http_proxy=http://squid.internal:3128"; > ~/.pam_environment
 echo "https_proxy=http://squid.internal:3128"; >> ~/.pam_environment
-echo "no_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,launchpad.net,cloud-images.ubuntu.com,changelogs.ubuntu.com,10.24.0.0/24" >> ~/.pam_environment
+echo "no_proxy=127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,launchpad.net,cloud-images.ubuntu.com,changelogs.ubuntu.com,login.ubuntu.com,10.24.0.0/24" >> ~/.pam_environment
 export https_proxy=http://squid.internal:3128
 
 if [ ! -e ~/autopkgtest ]; then
diff --git a/mojo/service-bundle b/mojo/service-bundle
index 6674ab6..b4bb074 100644
--- a/mojo/service-bundle
+++ b/mojo/service-bundle
@@ -15,7 +15,7 @@
 {%- if stage_name == "production" or stage_name == "staging" %}
     {%- set http_proxy = "http://squid.internal:3128"; %}
     {%- set https_proxy = "http://squid.internal:3128"; %}
-    {%- set no_proxy = "127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpad.net,10.24.0.0/24" %}
+    {%- set no_proxy = "127.0.0.1,127.0.1.1,localhost,localdomain,novalocal,internal,archive.ubuntu.com,ports.ubuntu.com,security.ubuntu.com,ddebs.ubuntu.com,changelogs.ubuntu.com,launchpad.net,login.ubuntu.com,10.24.0.0/24" %}
 {%- endif %}
 
 description: "autopkgtest-cloud"