commit 70c12fe45c15a699bc83b86c736e8a6dcfca9c7b
author Alexander Evseev <aevseev@mirantis.com> Thu Jul 19 09:29:20 2018 +0200
committer Alexander Evseev <aevseev@mirantis.com> Thu Jul 19 08:23:53 2018 +0000
tree a39a750417603dfd078c2f7e98996946fb1533d0
parent 96fd5772aa3eebb4cbd2d9fd6fd471f5e5c88ae2

Fix SMTP configuration

Fix the issue that ExtendedEmailPublisherDescriptor has
no method getSmtpAuthUsername.

Change-Id: I2d981673ab3226c9ae4600542642c3297579c08b

_states/jenkins_smtp.py

diff --git a/_states/jenkins_smtp.py b/_states/jenkins_smtp.py
index 45f0244..b03b3a7 100644
--- a/_states/jenkins_smtp.py
+++ b/_states/jenkins_smtp.py
@@ -3,12 +3,11 @@
 logger = logging.getLogger(__name__)
 
 set_smtp_groovy = """\
-def result = ""
+def result = "FAILED"
 for(desc in [Jenkins.getInstance().getDescriptor("hudson.plugins.emailext.ExtendedEmailPublisher"),Jenkins.getInstance().getDescriptor("hudson.tasks.Mailer")]){
     if(desc.getSmtpServer().equals("${host}") &&
-       ((desc instanceof hudson.plugins.emailext.ExtendedEmailPublisherDescriptor && desc.getSmtpAuthUsername().equals("${username}")) ||
-        (desc instanceof hudson.tasks.Mailer$DescriptorImpl && desc.getSmtpAuthUserName().equals("${username}"))) &&
-       desc.getSmtpAuthPassword().toString().equals("${password}") &&
+       (desc instanceof hudson.tasks.Mailer$DescriptorImpl ? desc.getSmtpAuthUserName() : desc.getSmtpUsername()) == "${username}" &&
+       (desc instanceof hudson.tasks.Mailer$DescriptorImpl ? desc.getSmtpAuthPassword() : desc.getSmtpPassword().toString()) == "${password}" &&
        desc.getSmtpPort().equals("${port}") &&
        desc.getUseSsl() == ${ssl} &&
        desc.getCharset().equals("${charset}") &&