fix broken CASC_JENKINS_CONFIG_ENV support + test case

[FIX JENKINS-51283] close #203 Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
jenkinsci · May 14, 2018 · a427774 · a427774
1 parent 624af92
commit a427774
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 5 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/casc/ConfigurationAsCode.java b/src/main/java/org/jenkinsci/plugins/casc/ConfigurationAsCode.java
@@ -125,11 +125,13 @@ public void configure() throws ConfiguratorException {
                 CASC_JENKINS_CONFIG_PROPERTY,
                 System.getenv(CASC_JENKINS_CONFIG_ENV)
         );
-        if (configParameter == null  && Files.exists(Paths.get(DEFAULT_JENKINS_YAML_PATH))) {
-            configParameter = DEFAULT_JENKINS_YAML_PATH;
-        } else {
-            // No configuration set nor default config file
-            return;
+        if (configParameter == null) {
+            if (Files.exists(Paths.get(DEFAULT_JENKINS_YAML_PATH))) {
+                configParameter = DEFAULT_JENKINS_YAML_PATH;
+            } else {
+                // No configuration set nor default config file
+                return;
+            }
         }
 
         configure(configParameter);

diff --git a/src/test/java/org/jenkinsci/plugins/casc/JenkinsConfigTest.java b/src/test/java/org/jenkinsci/plugins/casc/JenkinsConfigTest.java
@@ -0,0 +1,27 @@
+package org.jenkinsci.plugins.casc;
+
+import jenkins.model.Jenkins;
+import org.jenkinsci.plugins.casc.misc.EnvVarsRule;
+import org.jenkinsci.plugins.casc.misc.JenkinsConfiguredWithCodeRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.RuleChain;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * @author <a href="mailto:nicolas.deloof@gmail.com">Nicolas De Loof</a>
+ */
+public class JenkinsConfigTest {
+
+    @Rule
+    public RuleChain chain = RuleChain.outerRule( new EnvVarsRule()
+            .env("CASC_JENKINS_CONFIG", getClass().getResource("JenkinsConfigTest.yml").toExternalForm()))
+            .around(new JenkinsConfiguredWithCodeRule());
+
+
+    @Test
+    public void loadFromCASC_JENKINS_CONFIG() {
+        assertEquals("configuration as code - JenkinsConfigTest", Jenkins.getInstance().getSystemMessage());
+    }
+}
diff --git a/src/test/resources/org/jenkinsci/plugins/casc/JenkinsConfigTest.yml b/src/test/resources/org/jenkinsci/plugins/casc/JenkinsConfigTest.yml
@@ -0,0 +1,2 @@
+jenkins:
+  systemMessage: "configuration as code - JenkinsConfigTest"