sts-sponsors team mailing list archive

[Alexsander de Souza <mp+442623@xxxxxxxxxxxxxxxxxx>]

Alexsander de Souza has proposed merging ~alexsander-souza/maas/+git/maas-release-tools:workaround_jenkins_urllib_issue into ~maas-committers/maas/+git/maas-release-tools:main.

Commit message:
workaround urllib-jenkins issue
    
this workaround a recent incompatibility between urllib and python-jenkins (LP#2018567)


Requested reviews:
  MAAS Committers (maas-committers)

For more details, see:
https://code.launchpad.net/~alexsander-souza/maas/+git/maas-release-tools/+merge/442623
-- 
Your team MAAS Committers is requested to review the proposed merge of ~alexsander-souza/maas/+git/maas-release-tools:workaround_jenkins_urllib_issue into ~maas-committers/maas/+git/maas-release-tools:main.

diff --git a/maas_release_tools/maasci.py b/maas_release_tools/maasci.py
index 9ddf370..013aafb 100644
--- a/maas_release_tools/maasci.py
+++ b/maas_release_tools/maasci.py
@@ -54,6 +54,7 @@ class JenkinsActions:
         kwargs = {
             "username": config[server_section]["user"],
             "password": config[server_section]["password"],
+            "timeout": 60,
         }
         return Jenkins(url, **kwargs)
 
diff --git a/maas_release_tools/scripts/release_status.py b/maas_release_tools/scripts/release_status.py
index 5311481..27251c1 100644
--- a/maas_release_tools/scripts/release_status.py
+++ b/maas_release_tools/scripts/release_status.py
@@ -1214,10 +1214,10 @@ class SystemIntegrationTests(ReleaseStep):
                 )
             elif result == JJB_SKIP:
                 return (True, "System Integration checking disabled by user")
-        except JenkinsConnectionFailed:
+        except JenkinsConnectionFailed as e:
             return (
                 False,
-                "Failed to communicate with Jenkins, check your credentials",
+                f"Failed to communicate with Jenkins: {e}",
             )
         else:
             return True, None