commit ff4059c188205660d282c9a25e6ba09f75b9318a
author Jakub Josef <jakub.josef@gmail.com> Tue Aug 15 18:52:36 2017 +0200
committer Jakub Josef <jakub.josef@gmail.com> Tue Aug 15 18:52:36 2017 +0200
tree 9111a673b8a2934301600ed553ad4564ccfec011
parent 63dd4028ea8634669ce53384ad7e992f0859397d

Fixed jenkins artifactory server enforcement

Change-Id: Ic6cafccb66528d809a2726a1c80d7fd92bf7ccf3

_states/jenkins_artifactory.py

diff --git a/_states/jenkins_artifactory.py b/_states/jenkins_artifactory.py
index 63a63d6..dbd34d4 100644
--- a/_states/jenkins_artifactory.py
+++ b/_states/jenkins_artifactory.py
@@ -12,8 +12,8 @@
 if(server &&
    server.getName().equals("{name}") &&
    server.getUrl().equals("{serverUrl}") &&
-   server.getDeployerCredentialsConfig().getCredentialsId().equals("{credentialsId}") &&
-   server.getResolverCredentialsConfig().getCredentialsId().equals("{credentialsId}")){{
+   (server.getDeployerCredentialsConfig() == null || server.getDeployerCredentialsConfig().getCredentialsId().equals("{credentialsId}")) &&
+   (server.getResolverCredentialsConfig() == null || server.getResolverCredentialsConfig().getCredentialsId().equals("{credentialsId}"))){
         print("EXISTS")
 }}else{{
     // we must care about null here